Mercurial > hg-stable
view tests/test-rebase-rename.out @ 11843:00f8e7837668 stable
rebase: recompute the set of skipped rev when using --continue (issue2330)
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 13 Aug 2010 18:02:02 +0200 |
parents | 4bb4895e1693 |
children |
line wrap: on
line source
adding a adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head % Rename is tracked 2:rename A diff --git a/a b/a-renamed rename from a rename to a-renamed % Rebase the revision containing the rename % Rename is not lost 2:rename A diff --git a/a b/a-renamed rename from a rename to a-renamed adding a adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head % Copy is tracked 2:copy A diff --git a/a b/a-copied copy from a copy to a-copied % Rebase the revision containing the copy % Copy is not lost 2:copy A diff --git a/a b/a-copied copy from a copy to a-copied