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 Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 16 Nov 2009 16:10:05 -0500
branchstable
changeset 10479 bb508b312359
parent 7954 b969611064ae
child 11197 4bb4895e1693
permissions -rw-r--r--
bundle: exclude csets given in --base, unless they are in --rev (issue1910) Thanks Jesse Glick for the first version of this patch.
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


saving bundle to 












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    14














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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    15


% Rename is not lost












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    16


2:rename A












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    17


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




    18


rename from a












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    19


rename to a-renamed












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    20














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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    21


adding a












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    22


adding b












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    23


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




    24


created new head












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    25














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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    26


% Copy is tracked












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    27


2:copy A












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    28


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




    29


copy from a












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    30


copy to a-copied












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    31














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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    32


% Rebase the revision containing the copy












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    33


saving bundle to 












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    34














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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    35


% Copy is not lost












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    36


2:copy A












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    37


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




    38


copy from a












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    39


copy to a-copied












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



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    40
















mercurial