Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-rebase-rename.out
author Matt Mackall <mpm@selenic.com>
Sun, 26 Sep 2010 14:37:47 -0500
changeset 12517 cc8f1083e8be
parent 11197 4bb4895e1693
permissions -rw-r--r--
tests: unify test-convert-bzr-treeroot
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7954
b969611064ae rebase: don't lose rename/copy data (Issue1423)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     1
 
adding a
b969611064ae rebase: don't lose rename/copy data (Issue1423)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     2
 
adding b
b969611064ae rebase: don't lose rename/copy data (Issue1423)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     3
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b969611064ae rebase: don't lose rename/copy data (Issue1423)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     4
 
created new head
b969611064ae rebase: don't lose rename/copy data (Issue1423)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     5
 












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




     6


% Rename is tracked












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




     7


2:rename A












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




     8


diff --git a/a b/a-renamed












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




     9


rename from a












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    10


rename to a-renamed












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    11














b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    12


% Rebase the revision containing the rename












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    13














b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    14


% Rename is not lost












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    15


2:rename A












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    16


diff --git a/a b/a-renamed












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    17


rename from a












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    18


rename to a-renamed












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    19














b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    20


adding a












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    21


adding b












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    22


0 files updated, 0 files merged, 1 files removed, 0 files unresolved












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    23


created new head












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    24














b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    25


% Copy is tracked












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    26


2:copy A












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    27


diff --git a/a b/a-copied












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    28


copy from a












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    29


copy to a-copied












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    30














b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    31


% Rebase the revision containing the copy












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    32














b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    33


% Copy is not lost












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    34


2:copy A












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    35


diff --git a/a b/a-copied












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    36


copy from a












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    37


copy to a-copied












b969611064ae
rebase: don't lose rename/copy data (Issue1423)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    38
















mercurial