equal
deleted
inserted
replaced
30 $ hg qrefresh -m "rm a" |
30 $ hg qrefresh -m "rm a" |
31 |
31 |
32 Save the patch queue so we can merge it later: |
32 Save the patch queue so we can merge it later: |
33 |
33 |
34 $ hg qsave -c -e |
34 $ hg qsave -c -e |
35 copy .*/t/.hg/patches to .*/t/.hg/patches.1 |
35 copy .*/t/\.hg/patches to .*/t/\.hg/patches\.1 |
36 $ checkundo |
36 $ checkundo |
37 |
37 |
38 Update b and commit in an "update" changeset: |
38 Update b and commit in an "update" changeset: |
39 |
39 |
40 $ hg up -C init |
40 $ hg up -C init |
50 $ hg manifest |
50 $ hg manifest |
51 a |
51 a |
52 b |
52 b |
53 |
53 |
54 $ hg qpush -a -m |
54 $ hg qpush -a -m |
55 merging with queue at: .*/t/.hg/patches.1 |
55 merging with queue at: .*/t/\.hg/patches\.1 |
56 applying rm_a |
56 applying rm_a |
57 now at: rm_a |
57 now at: rm_a |
58 |
58 |
59 $ checkundo |
59 $ checkundo |
60 $ hg manifest |
60 $ hg manifest |
89 $ hg qnew -d '0 0' -f -e patcha2 |
89 $ hg qnew -d '0 0' -f -e patcha2 |
90 |
90 |
91 Create the reference queue: |
91 Create the reference queue: |
92 |
92 |
93 $ hg qsave -c -e -n refqueue |
93 $ hg qsave -c -e -n refqueue |
94 copy .*/t2/.hg/patches to .*/t2/.hg/refqueue |
94 copy .*/t2/\.hg/patches to .*/t2/\.hg/refqueue |
95 $ hg up -C 1 |
95 $ hg up -C 1 |
96 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
96 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
97 |
97 |
98 Merge: |
98 Merge: |
99 |
99 |
100 $ HGMERGE=internal:other hg qpush -a -m -n refqueue |
100 $ HGMERGE=internal:other hg qpush -a -m -n refqueue |
101 merging with queue at: .*/t2/.hg/refqueue |
101 merging with queue at: .*/t2/\.hg/refqueue |
102 applying patcha |
102 applying patcha |
103 patching file a |
103 patching file a |
104 Hunk #1 FAILED at 0 |
104 Hunk #1 FAILED at 0 |
105 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
105 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
106 patch failed, unable to continue (try -v) |
106 patch failed, unable to continue (try -v) |