Mercurial > hg
view tests/test-rebase-rename.t @ 17612:fc2a6114f0a0
rebase: allow creation obsolescence relation instead of stripping
When obsolescence feature is enabled we now create markers from the rebased
set to the resulting set instead of stripping. The "state" mapping built by
rebase holds all necessary data.
Changesets "deleted" by the rebase are marked "succeeded" by the changeset they
would be rebased one. That the best guess of "successors" we have. Getting a
successors as meaningful as possible is important for automatic resolution of
obsolescence troubles. In other word, emptied changeset will looks collapsed
with their former parents. (see "empty changeset" section of the test if you are
still confused)
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Tue, 18 Sep 2012 23:13:31 +0200 |
parents | f2719b387380 |
children | f23dea2b296e |
line wrap: on
line source
$ cat >> $HGRCPATH <<EOF > [extensions] > graphlog= > rebase= > > [alias] > tlog = log --template "{rev}: '{desc}' {branches}\n" > tglog = tlog --graph > EOF $ hg init a $ cd a $ echo a > a $ hg ci -Am A adding a $ echo b > b $ hg ci -Am B adding b $ hg up -q -C 0 $ hg mv a a-renamed $ hg ci -m 'rename A' created new head $ hg tglog @ 2: 'rename A' | | o 1: 'B' |/ o 0: 'A' Rename is tracked: $ hg tlog -p --git -r tip 2: 'rename A' diff --git a/a b/a-renamed rename from a rename to a-renamed Rebase the revision containing the rename: $ hg rebase -s 2 -d 1 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) $ hg tglog @ 2: 'rename A' | o 1: 'B' | o 0: 'A' Rename is not lost: $ hg tlog -p --git -r tip 2: 'rename A' diff --git a/a b/a-renamed rename from a rename to a-renamed $ cd .. $ hg init b $ cd b $ echo a > a $ hg ci -Am A adding a $ echo b > b $ hg ci -Am B adding b $ hg up -q -C 0 $ hg cp a a-copied $ hg ci -m 'copy A' created new head $ hg tglog @ 2: 'copy A' | | o 1: 'B' |/ o 0: 'A' Copy is tracked: $ hg tlog -p --git -r tip 2: 'copy A' diff --git a/a b/a-copied copy from a copy to a-copied Rebase the revision containing the copy: $ hg rebase -s 2 -d 1 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob) $ hg tglog @ 2: 'copy A' | o 1: 'B' | o 0: 'A' Copy is not lost: $ hg tlog -p --git -r tip 2: 'copy A' diff --git a/a b/a-copied copy from a copy to a-copied $ cd .. Test rebase across repeating renames: $ hg init repo $ cd repo $ echo testing > file1.txt $ hg add file1.txt $ hg ci -m "Adding file1" $ hg rename file1.txt file2.txt $ hg ci -m "Rename file1 to file2" $ echo Unrelated change > unrelated.txt $ hg add unrelated.txt $ hg ci -m "Unrelated change" $ hg rename file2.txt file1.txt $ hg ci -m "Rename file2 back to file1" $ hg update -r -2 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo Another unrelated change >> unrelated.txt $ hg ci -m "Another unrelated change" created new head $ hg tglog @ 4: 'Another unrelated change' | | o 3: 'Rename file2 back to file1' |/ o 2: 'Unrelated change' | o 1: 'Rename file1 to file2' | o 0: 'Adding file1' $ hg rebase -s 4 -d 3 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob) $ hg diff --stat -c . unrelated.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) $ cd ..