https://bz.mercurial-scm.org/show_bug.cgi?id=6283
Bug ID: 6283
Summary: `hg unbundle` restores obsmarkers, but `hg pull` from
the bundle does not
Product: Mercurial
Version: 5.3
Hardware: All
OS: All
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: evolution
Assignee: bugzi...@mercurial-scm.org
Reporter: matt_harbi...@yahoo.com
CC: mercurial-devel@mercurial-scm.org,
pierre-yves.da...@ens-lyon.org
Python Version: ---
Apply this test to 8cdd0b9629e3
diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t
--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@@ -10,6 +10,8 @@ Enable obsolete
> [experimental]
> evolution.createmarkers=True
> evolution.allowunstable=True
+ > evolution=all
+ > evolution.exchange=True
> [phases]
> publish=False
> [extensions]
@@ -108,6 +110,88 @@ simple rebase
5fddd98957c8a54a4d436dfe1da9d87f21a1b97b
2327fea05063f39961b14cb69435a9898dc9a245 0 (Thu Jan 01 00:00:00 1970 +0000)
{'ef1': '4', 'operation': 'rebase', 'user': 'test'}
32af7686d403cf45b5d95f2d70cebea587ac806a
8eeb3c33ad33d452c89e5dcf611c347f978fb42b 0 (Thu Jan 01 00:00:00 1970 +0000)
{'ef1': '4', 'operation': 'rebase', 'user': 'test'}
+ $ hg strip -r e4e5be0395b2
+ 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
+ saved backup bundle to
$TESTTMP/simple/.hg/strip-backup/e4e5be0395b2-9de0fa94-backup.hg
+ $ hg log -G
+ o 7:02de42196ebe H
+ |
+ | @ 6:eea13746799a G
+ |/|
+ o | 5:24b6387c8c8c F
+ | |
+ | o 4:9520eea781bc E
+ |/
+ | o 3:32af7686d403 D
+ | |
+ | o 2:5fddd98957c8 C
+ | |
+ | o 1:42ccdea3bb16 B
+ |/
+ o 0:cd010b8cd998 A
+
+
+ $ hg pull $TESTTMP/simple/.hg/strip-backup/e4e5be0395b2-9de0fa94-backup.hg
+ pulling from
$TESTTMP/simple/.hg/strip-backup/e4e5be0395b2-9de0fa94-backup.hg
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 3 changesets with 0 changes to 0 files
+ new changesets e4e5be0395b2:8eeb3c33ad33 (3 drafts)
+ (run 'hg update' to get a working copy)
+ $ hg log -G
+ o 10:8eeb3c33ad33 D
+ |
+ o 9:2327fea05063 C
+ |
+ o 8:e4e5be0395b2 B
+ |
+ | o 7:02de42196ebe H
+ | |
+ @ | 6:eea13746799a G
+ |\|
+ | o 5:24b6387c8c8c F
+ | |
+ o | 4:9520eea781bc E
+ |/
+ | o 3:32af7686d403 D
+ | |
+ | o 2:5fddd98957c8 C
+ | |
+ | o 1:42ccdea3bb16 B
+ |/
+ o 0:cd010b8cd998 A
+
+
+ $ hg rollback --config ui.rollback=True
+ repository tip rolled back to revision 7 (undo pull)
+ $ hg unbundle
$TESTTMP/simple/.hg/strip-backup/e4e5be0395b2-9de0fa94-backup.hg
+ adding changesets
+ adding manifests
+ adding file changes
+ added 3 changesets with 0 changes to 3 files
+ 3 new obsolescence markers
+ obsoleted 3 changesets
+ new changesets e4e5be0395b2:8eeb3c33ad33 (3 drafts)
+ (run 'hg update' to get a working copy)
+ $ hg log -G
+ o 10:8eeb3c33ad33 D
+ |
+ o 9:2327fea05063 C
+ |
+ o 8:e4e5be0395b2 B
+ |
+ | o 7:02de42196ebe H
+ | |
+ @ | 6:eea13746799a G
+ |\|
+ | o 5:24b6387c8c8c F
+ | |
+ o | 4:9520eea781bc E
+ |/
+ o 0:cd010b8cd998 A
+
$ cd ..
I don't think the experimental config here matters, but there are problems when
just using `experimental.evolution=all` in some cases (see issue6275).
--
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
