equal
deleted
inserted
replaced
70 |
70 |
71 $ hg up 2 |
71 $ hg up 2 |
72 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
72 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
73 $ hg import ../merge.diff |
73 $ hg import ../merge.diff |
74 applying ../merge.diff |
74 applying ../merge.diff |
|
75 warning: import the patch as a normal revision |
|
76 (use --exact to import the patch as a merge) |
75 $ tipparents |
77 $ tipparents |
76 2:890ecaa90481 addc |
78 2:890ecaa90481 addc |
77 $ hg strip --no-backup tip |
79 $ hg strip --no-backup tip |
78 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
80 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
79 |
81 |
103 |
105 |
104 $ hg up 2 |
106 $ hg up 2 |
105 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
107 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
106 $ hg import --bypass ../merge.diff |
108 $ hg import --bypass ../merge.diff |
107 applying ../merge.diff |
109 applying ../merge.diff |
|
110 warning: import the patch as a normal revision |
|
111 (use --exact to import the patch as a merge) |
108 $ tipparents |
112 $ tipparents |
109 2:890ecaa90481 addc |
113 2:890ecaa90481 addc |
110 $ hg strip --no-backup tip |
114 $ hg strip --no-backup tip |
111 |
115 |
112 Test with --bypass and --exact |
116 Test with --bypass and --exact |