Mercurial > hg
annotate tests/test-merge1.t @ 25591:f1d46075b13a
verify: check the subrepository references in .hgsubstate
While hopefully atypical, there are reasons that a subrepository revision can be
lost that aren't covered by corruption of the .hgsubstate revlog. Such things
can happen when a subrepo is amended, stripped or simply isn't pulled from
upstream because the parent repo revision wasn't updated yet. There's no way to
know if it is an error, but this will find potential problems sooner than when
some random revision is updated.
Until recently, convert made no attempt at rewriting the .hgsubstate file. The
impetuous for this is to verify the conversion of some repositories, and this is
orders of magnitude faster than a bash script from 0..tip that does an
'hg update -C $rev'. But it is equally useful to determine if everything has
been pulled down before taking a thumb drive on the go.
It feels somewhat wrong to leave this out of verifymod (mostly because the file
is already read in there, and the final summary is printed before the subrepos
are checked). But verifymod looks very low level, so importing subrepo stuff
there seems more wrong.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Tue, 16 Jun 2015 16:15:15 -0400 |
parents | 6084926366b9 |
children | fe03f522dda9 |
rev | line source |
---|---|
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
1 $ cat <<EOF > merge |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
2 > import sys, os |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
3 > |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
4 > try: |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
5 > import msvcrt |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
6 > msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
7 > msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
8 > except ImportError: |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
9 > pass |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
10 > |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
11 > print "merging for", os.path.basename(sys.argv[1]) |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
12 > EOF |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
13 $ HGMERGE="python ../merge"; export HGMERGE |
7080
a6477aa893b8
tests: Windows compatibility fixes
Patrick Mezard <pmezard@gmail.com>
parents:
4294
diff
changeset
|
14 |
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
13439
diff
changeset
|
15 $ hg init t |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
16 $ cd t |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
17 $ echo This is file a1 > a |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
18 $ hg add a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
19 $ hg commit -m "commit #0" |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
20 $ echo This is file b1 > b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
21 $ hg add b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
22 $ hg commit -m "commit #1" |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
23 |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
24 $ hg update 0 |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
25 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
19482
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
26 |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
27 Test interrupted updates by exploiting our non-handling of directory collisions |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
28 |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
29 $ mkdir b |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
30 $ hg up |
19498
3ac1735a2265
tests: glob out exception type for directory collision
Matt Mackall <mpm@selenic.com>
parents:
19482
diff
changeset
|
31 abort: *: '$TESTTMP/t/b' (glob) |
19482
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
32 [255] |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
33 $ hg ci |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
34 abort: last update was interrupted |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
35 (use 'hg update' to get a consistent checkout) |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
36 [255] |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
37 $ hg sum |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
38 parent: 0:538afb845929 |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
39 commit #0 |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
40 branch: default |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
41 commit: (interrupted update) |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
42 update: 1 new changesets (update) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
43 phases: 2 draft |
19482
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
44 $ rmdir b |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
45 $ hg up |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
46 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
47 $ hg sum |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
48 parent: 1:b8bb4a988f25 tip |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
49 commit #1 |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
50 branch: default |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
51 commit: (clean) |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
52 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
53 phases: 2 draft |
19482
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
54 |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
55 Prepare a basic merge |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
56 |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
57 $ hg up 0 |
499fc471296b
update: add tracking of interrupted updates (issue3113)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
58 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
59 $ echo This is file c1 > c |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
60 $ hg add c |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
61 $ hg commit -m "commit #2" |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
62 created new head |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
63 $ echo This is file b1 > b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
64 no merges expected |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
65 $ hg merge -P 1 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
66 changeset: 1:b8bb4a988f25 |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
67 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
68 date: Thu Jan 01 00:00:00 1970 +0000 |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
69 summary: commit #1 |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
70 |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
71 $ hg merge 1 |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
72 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
73 (branch merge, don't forget to commit) |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
74 $ hg diff --nodates |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
75 diff -r 49035e18a8e6 b |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
76 --- /dev/null |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
77 +++ b/b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
78 @@ -0,0 +1,1 @@ |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
79 +This is file b1 |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
80 $ hg status |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
81 M b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
82 $ cd ..; rm -r t |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
83 |
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
13439
diff
changeset
|
84 $ hg init t |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
85 $ cd t |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
86 $ echo This is file a1 > a |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
87 $ hg add a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
88 $ hg commit -m "commit #0" |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
89 $ echo This is file b1 > b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
90 $ hg add b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
91 $ hg commit -m "commit #1" |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
92 |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
93 $ hg update 0 |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
94 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
95 $ echo This is file c1 > c |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
96 $ hg add c |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
97 $ hg commit -m "commit #2" |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
98 created new head |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
99 $ echo This is file b2 > b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
100 merge should fail |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
101 $ hg merge 1 |
15894
44fa047cef57
merge: report all files in _checkunknown
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15619
diff
changeset
|
102 b: untracked file differs |
44fa047cef57
merge: report all files in _checkunknown
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15619
diff
changeset
|
103 abort: untracked files in working directory differ from files in requested revision |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
104 [255] |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
105 merge of b expected |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
106 $ hg merge -f 1 |
13439
d724a69309e0
util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents:
12664
diff
changeset
|
107 merging b |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
108 merging for b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
109 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
110 (branch merge, don't forget to commit) |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
111 $ hg diff --nodates |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
112 diff -r 49035e18a8e6 b |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
113 --- /dev/null |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
114 +++ b/b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
115 @@ -0,0 +1,1 @@ |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
116 +This is file b2 |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
117 $ hg status |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
118 M b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
119 $ cd ..; rm -r t |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
120 |
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
13439
diff
changeset
|
121 $ hg init t |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
122 $ cd t |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
123 $ echo This is file a1 > a |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
124 $ hg add a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
125 $ hg commit -m "commit #0" |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
126 $ echo This is file b1 > b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
127 $ hg add b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
128 $ hg commit -m "commit #1" |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
129 $ echo This is file b22 > b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
130 $ hg commit -m "commit #2" |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
131 $ hg update 1 |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
132 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
133 $ echo This is file c1 > c |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
134 $ hg add c |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
135 $ hg commit -m "commit #3" |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
136 created new head |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
137 |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
138 Contents of b should be "this is file b1" |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
139 $ cat b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
140 This is file b1 |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
814
diff
changeset
|
141 |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
142 $ echo This is file b22 > b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
143 merge fails |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
144 $ hg merge 2 |
19802
94c394653b2a
merge: standardize error message for dirty working dir
Siddharth Agarwal <sid0@fb.com>
parents:
19498
diff
changeset
|
145 abort: uncommitted changes |
15619
6c8573dd1b6b
merge: make 'nothing to merge' aborts consistent
Kevin Bullock <kbullock@ringworld.org>
parents:
15243
diff
changeset
|
146 (use 'hg status' to list changes) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
147 [255] |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13956
diff
changeset
|
148 merge expected! |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
149 $ hg merge -f 2 |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
150 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
151 (branch merge, don't forget to commit) |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
152 $ hg diff --nodates |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
153 diff -r 85de557015a8 b |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
154 --- a/b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
155 +++ b/b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
156 @@ -1,1 +1,1 @@ |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
157 -This is file b1 |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
158 +This is file b22 |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
159 $ hg status |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
160 M b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
161 $ cd ..; rm -r t |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
162 |
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
13439
diff
changeset
|
163 $ hg init t |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
164 $ cd t |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
165 $ echo This is file a1 > a |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
166 $ hg add a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
167 $ hg commit -m "commit #0" |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
168 $ echo This is file b1 > b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
169 $ hg add b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
170 $ hg commit -m "commit #1" |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
171 $ echo This is file b22 > b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
172 $ hg commit -m "commit #2" |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
173 $ hg update 1 |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
174 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
175 $ echo This is file c1 > c |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
176 $ hg add c |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
177 $ hg commit -m "commit #3" |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
178 created new head |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
179 $ echo This is file b33 > b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
180 merge of b should fail |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
181 $ hg merge 2 |
19802
94c394653b2a
merge: standardize error message for dirty working dir
Siddharth Agarwal <sid0@fb.com>
parents:
19498
diff
changeset
|
182 abort: uncommitted changes |
15619
6c8573dd1b6b
merge: make 'nothing to merge' aborts consistent
Kevin Bullock <kbullock@ringworld.org>
parents:
15243
diff
changeset
|
183 (use 'hg status' to list changes) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
184 [255] |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
185 merge of b expected |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
186 $ hg merge -f 2 |
13439
d724a69309e0
util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents:
12664
diff
changeset
|
187 merging b |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
188 merging for b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
189 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
190 (branch merge, don't forget to commit) |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
191 $ hg diff --nodates |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11975
diff
changeset
|
192 diff -r 85de557015a8 b |
11975
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
193 --- a/b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
194 +++ b/b |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
195 @@ -1,1 +1,1 @@ |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
196 -This is file b1 |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
197 +This is file b33 |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
198 $ hg status |
21884b433c51
tests: unify test-merge1
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
199 M b |
12664
545ec1775021
merge: handle no file parent in backwards merge (issue2364)
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
200 |
545ec1775021
merge: handle no file parent in backwards merge (issue2364)
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
201 Test for issue2364 |
545ec1775021
merge: handle no file parent in backwards merge (issue2364)
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
202 |
545ec1775021
merge: handle no file parent in backwards merge (issue2364)
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
203 $ hg up -qC . |
545ec1775021
merge: handle no file parent in backwards merge (issue2364)
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
204 $ hg rm b |
545ec1775021
merge: handle no file parent in backwards merge (issue2364)
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
205 $ hg ci -md |
545ec1775021
merge: handle no file parent in backwards merge (issue2364)
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
206 $ hg revert -r -2 b |
545ec1775021
merge: handle no file parent in backwards merge (issue2364)
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
207 $ hg up -q -- -2 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15894
diff
changeset
|
208 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15894
diff
changeset
|
209 $ cd .. |