##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

subrepo: change default path in hgrc of subrepo after cloning...
subrepo: change default path in hgrc of subrepo after cloning Previous behavior was to put in the cloned subrepos the path found in the original main repo. However it isn't valid for relative path and it seems more logical to reference instead the subrepos working copy path of the original main repo.
Patrick Mezard - - Load All Authors

File last commit:

r10185:7637fe4f stable
r10378:e1401c74 default
Show More
test-mq-merge.out
52 lines | 1.1 KiB | text/plain | TextLexer
/ tests / test-mq-merge.out
History | Source | Raw |Copy content |Copy permalink
Patrick Mezard
Add test for issue 529 - "mq aborts when merging patch deleting files".
 r4333 adding a
adding b
copy .hg/patches to .hg/patches.1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
M b
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Patrick Mezard
Add test for issue 529 - "mq aborts when merging patch deleting files".
 r4333 a
b
merging with queue at: .hg/patches.1
applying rm_a
Martin Geisler
mq: lowercase output...
 r7627 now at: rm_a
Patrick Mezard
Add test for issue 529 - "mq aborts when merging patch deleting files".
 r4333 b
Mads Kiilerich
mq: qpop now tells which patches are popped...
 r9110 popping rm_a
popping .hg.patches.merge.marker
Martin Geisler
mq: lowercase output...
 r7627 patch queue now empty
Patrick Mezard
test-mq-merge: test mq merge and explicit patch queue
 r6628
% init t2
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% create the reference queue
Patrick Mezard
mq: preserve --git flag when merging patches...
 r10185 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Patrick Mezard
test-mq-merge: test mq merge and explicit patch queue
 r6628 % merge
merging with queue at refqueue
applying patcha
Patrick Mezard
mq: preserve --git flag when merging patches...
 r10185 patching file a
Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file a.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
patch didn't work out, merging patcha
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
applying patcha2
now at: patcha2
% check patcha is still a git patch
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,2 @@
-b
+a
+c
diff --git a/a b/aa
copy from a
copy to aa
--- a/a
+++ b/aa
@@ -1,1 +1,1 @@
-b
+a
% check patcha2 is still a regular patch