##// END OF EJS Templates
Backed out changeset d557749c627a...
Patrick Mezard -
r6934:abb915d9 default
parent child Browse files
Show More
@@ -587,7 +587,6 b' def commit(ui, repo, *pats, **opts):'
587 return
587 return
588 cl = repo.changelog
588 cl = repo.changelog
589 rev = cl.rev(node)
589 rev = cl.rev(node)
590 ui.note(_('committed changeset %s\n') % short(node))
591 parents = cl.parentrevs(rev)
590 parents = cl.parentrevs(rev)
592 if rev - 1 in parents:
591 if rev - 1 in parents:
593 # one of the parents was the old tip
592 # one of the parents was the old tip
@@ -2,12 +2,10 b' adding dir/bar'
2 adding foo
2 adding foo
3 dir/bar
3 dir/bar
4 foo
4 foo
5 committed changeset d44511117907
6 adding dir/bar_2
5 adding dir/bar_2
7 adding foo_2
6 adding foo_2
8 dir/bar_2
7 dir/bar_2
9 foo_2
8 foo_2
10 committed changeset a85812e0561a
11 adding a
9 adding a
12 adding c
10 adding c
13 removing a
11 removing a
@@ -5,7 +5,6 b' a'
5 % test case collision on rename (issue 750)
5 % test case collision on rename (issue 750)
6 adding a
6 adding a
7 a
7 a
8 committed changeset 07f494440405
9 A: not overwriting - file exists
8 A: not overwriting - file exists
10 % test case collision between revisions (issue 912)
9 % test case collision between revisions (issue 912)
11 adding a
10 adding a
@@ -7,6 +7,10 b' echo foo > foo'
7 hg add foo
7 hg add foo
8 HGEDITOR=true hg commit -m ""
8 HGEDITOR=true hg commit -m ""
9 hg commit -d '0 0' -m commit-1
9 hg commit -d '0 0' -m commit-1
10 # An empty date was interpreted as epoch origin
11 echo foo >> foo
12 hg commit -d '' -m commit-no-date
13 hg tip --template '{date|isodate}\n' | grep '1970'
10 echo foo >> foo
14 echo foo >> foo
11 hg commit -d '1 4444444' -m commit-3
15 hg commit -d '1 4444444' -m commit-3
12 hg commit -d '1 15.1' -m commit-4
16 hg commit -d '1 15.1' -m commit-4
@@ -48,10 +52,6 b' touch quux'
48 hg commit -d '0 0' -m commit-16 quux
52 hg commit -d '0 0' -m commit-16 quux
49 echo >> dir/file
53 echo >> dir/file
50 hg -v commit -d '0 0' -m commit-17 dir/file
54 hg -v commit -d '0 0' -m commit-17 dir/file
51 # An empty date was interpreted as epoch origin
52 echo foo >> foo
53 hg commit -d '' -m commit-no-date
54 hg tip --template '{date|isodate}\n' | grep '1970'
55 cd ..
55 cd ..
56
56
57 echo % partial subdir commit test
57 echo % partial subdir commit test
@@ -11,19 +11,16 b' nothing changed'
11 abort: file bar not found!
11 abort: file bar not found!
12 adding dir/file
12 adding dir/file
13 dir/file
13 dir/file
14 committed changeset d2a76177cb42
15 adding dir.file
14 adding dir.file
16 abort: no match under directory dir!
15 abort: no match under directory dir!
17 abort: no match under directory .!
16 abort: no match under directory .!
18 abort: no match under directory ../dir2!
17 abort: no match under directory ../dir2!
19 dir/file
18 dir/file
20 committed changeset 1cd62a2d8db5
21 does-not-exist: No such file or directory
19 does-not-exist: No such file or directory
22 abort: file does-not-exist not found!
20 abort: file does-not-exist not found!
23 abort: file baz not tracked!
21 abort: file baz not tracked!
24 abort: file quux not tracked!
22 abort: file quux not tracked!
25 dir/file
23 dir/file
26 committed changeset 49176991390e
27 % partial subdir commit test
24 % partial subdir commit test
28 adding bar/bar
25 adding bar/bar
29 adding foo/foo
26 adding foo/foo
@@ -1,7 +1,6 b''
1 A b
1 A b
2 b
2 b
3 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
3 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
4 committed changeset 386a3cc01532
5 we should see two history entries
4 we should see two history entries
6 changeset: 1:386a3cc01532
5 changeset: 1:386a3cc01532
7 tag: tip
6 tag: tip
@@ -150,5 +150,4 b' Automatically installed hook'
150 foo
150 foo
151 calling hook commit.auto: <function autohook>
151 calling hook commit.auto: <function autohook>
152 Automatically installed hook
152 Automatically installed hook
153 committed changeset 52998019f625
154 hooks.commit.auto=<function autohook>
153 hooks.commit.auto=<function autohook>
@@ -8,7 +8,6 b' adding a'
8 b
8 b
9 b: searching for copy revision for a
9 b: searching for copy revision for a
10 b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db
10 b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db
11 committed changeset 755e75751bf6
12 checking changesets
11 checking changesets
13 checking manifests
12 checking manifests
14 crosschecking files in changesets and manifests
13 crosschecking files in changesets and manifests
@@ -117,7 +117,6 b' a'
117 b
117 b
118 overwriting a expanding keywords
118 overwriting a expanding keywords
119 running hook commit.test: cp a hooktest
119 running hook commit.test: cp a hooktest
120 committed changeset ef63ca68695b
121 % status
120 % status
122 ? hooktest
121 ? hooktest
123 % identify
122 % identify
@@ -224,7 +223,6 b' c'
224 c
223 c
225 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
224 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
226 overwriting c expanding keywords
225 overwriting c expanding keywords
227 committed changeset e22d299ac0c2
228 % cat a c
226 % cat a c
229 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
227 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
230 do not process $Id:
228 do not process $Id:
@@ -282,7 +280,6 b' M a'
282 % commit
280 % commit
283 a
281 a
284 overwriting a expanding keywords
282 overwriting a expanding keywords
285 committed changeset bb948857c743
286 % status
283 % status
287 % verify
284 % verify
288 checking changesets
285 checking changesets
@@ -309,7 +306,6 b' 1: do not process $Id:'
309 1: xxx $
306 1: xxx $
310 2: $Xinfo$
307 2: $Xinfo$
311 % remove
308 % remove
312 committed changeset d14c71265376
313 % status
309 % status
314 % rollback
310 % rollback
315 rolling back last transaction
311 rolling back last transaction
@@ -341,7 +337,6 b' summary: firstline'
341 % commit rejecttest
337 % commit rejecttest
342 a
338 a
343 overwriting a expanding keywords
339 overwriting a expanding keywords
344 committed changeset 85e279d709ff
345 % export
340 % export
346 % import
341 % import
347 applying ../rejecttest.diff
342 applying ../rejecttest.diff
@@ -365,7 +360,6 b' abort: outstanding uncommitted changes'
365 x/a
360 x/a
366 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
361 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
367 overwriting x/a expanding keywords
362 overwriting x/a expanding keywords
368 committed changeset cfa68229c116
369 % cat a
363 % cat a
370 expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $
364 expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $
371 do not process $Id:
365 do not process $Id:
General Comments 0
You need to be logged in to leave comments. Login now