equal
deleted
inserted
replaced
56 $ hg qrefresh -m "rm a" |
56 $ hg qrefresh -m "rm a" |
57 |
57 |
58 Save the patch queue so we can merge it later: |
58 Save the patch queue so we can merge it later: |
59 |
59 |
60 $ hg qsave -c -e |
60 $ hg qsave -c -e |
61 copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1 (glob) |
61 copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1 |
62 $ checkundo |
62 $ checkundo |
63 |
63 |
64 Update b and commit in an "update" changeset: |
64 Update b and commit in an "update" changeset: |
65 |
65 |
66 $ hg up -C init |
66 $ hg up -C init |
76 $ hg manifest |
76 $ hg manifest |
77 a |
77 a |
78 b |
78 b |
79 |
79 |
80 $ hg qpush -a -m |
80 $ hg qpush -a -m |
81 merging with queue at: $TESTTMP/t/.hg/patches.1 (glob) |
81 merging with queue at: $TESTTMP/t/.hg/patches.1 |
82 applying rm_a |
82 applying rm_a |
83 now at: rm_a |
83 now at: rm_a |
84 |
84 |
85 $ checkundo |
85 $ checkundo |
86 $ hg manifest |
86 $ hg manifest |
115 $ hg qnew -d '0 0' -f -e patcha2 |
115 $ hg qnew -d '0 0' -f -e patcha2 |
116 |
116 |
117 Create the reference queue: |
117 Create the reference queue: |
118 |
118 |
119 $ hg qsave -c -e -n refqueue |
119 $ hg qsave -c -e -n refqueue |
120 copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue (glob) |
120 copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue |
121 $ hg up -C 1 |
121 $ hg up -C 1 |
122 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
122 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
123 |
123 |
124 Merge: |
124 Merge: |
125 |
125 |
126 $ HGMERGE=internal:other hg qpush -a -m -n refqueue |
126 $ HGMERGE=internal:other hg qpush -a -m -n refqueue |
127 merging with queue at: $TESTTMP/t2/.hg/refqueue (glob) |
127 merging with queue at: $TESTTMP/t2/.hg/refqueue |
128 applying patcha |
128 applying patcha |
129 patching file a |
129 patching file a |
130 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). |
130 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). |
131 fuzz found when applying patch, stopping |
131 fuzz found when applying patch, stopping |
132 patch didn't work out, merging patcha |
132 patch didn't work out, merging patcha |