Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-grep.out @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
parents | 8eaaf1321bfe |
children | 7ed86c28f1ae |
rev | line source |
---|---|
1148
fad2d091c74f
Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff
changeset
|
1 port:4:export |
fad2d091c74f
Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff
changeset
|
2 port:4:vaportight |
fad2d091c74f
Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff
changeset
|
3 port:4:import/export |
2868
81f351c5264d
grep: display correct user/revision for --all in reverse.
Brendan Cully <brendan@kublai.com>
parents:
1148
diff
changeset
|
4 port:4:4:-:spam:import/export |
81f351c5264d
grep: display correct user/revision for --all in reverse.
Brendan Cully <brendan@kublai.com>
parents:
1148
diff
changeset
|
5 port:3:4:+:eggs:import/export |
81f351c5264d
grep: display correct user/revision for --all in reverse.
Brendan Cully <brendan@kublai.com>
parents:
1148
diff
changeset
|
6 port:2:1:-:spam:import |
81f351c5264d
grep: display correct user/revision for --all in reverse.
Brendan Cully <brendan@kublai.com>
parents:
1148
diff
changeset
|
7 port:2:2:-:spam:export |
81f351c5264d
grep: display correct user/revision for --all in reverse.
Brendan Cully <brendan@kublai.com>
parents:
1148
diff
changeset
|
8 port:2:1:+:spam:export |
81f351c5264d
grep: display correct user/revision for --all in reverse.
Brendan Cully <brendan@kublai.com>
parents:
1148
diff
changeset
|
9 port:2:2:+:spam:vaportight |
81f351c5264d
grep: display correct user/revision for --all in reverse.
Brendan Cully <brendan@kublai.com>
parents:
1148
diff
changeset
|
10 port:2:3:+:spam:import/export |
81f351c5264d
grep: display correct user/revision for --all in reverse.
Brendan Cully <brendan@kublai.com>
parents:
1148
diff
changeset
|
11 port:1:2:+:eggs:export |
81f351c5264d
grep: display correct user/revision for --all in reverse.
Brendan Cully <brendan@kublai.com>
parents:
1148
diff
changeset
|
12 port:0:1:+:eggs:import |
1148
fad2d091c74f
Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff
changeset
|
13 port:4:import/export |
2869
8eaaf1321bfe
grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents:
2868
diff
changeset
|
14 % follow |
8eaaf1321bfe
grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents:
2868
diff
changeset
|
15 port:0:import |
8eaaf1321bfe
grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents:
2868
diff
changeset
|
16 port2:6:4:+:eggs:deport |
8eaaf1321bfe
grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents:
2868
diff
changeset
|
17 port:4:4:-:spam:import/export |
8eaaf1321bfe
grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents:
2868
diff
changeset
|
18 port:3:4:+:eggs:import/export |
8eaaf1321bfe
grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents:
2868
diff
changeset
|
19 port:2:1:-:spam:import |
8eaaf1321bfe
grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents:
2868
diff
changeset
|
20 port:2:2:-:spam:export |
8eaaf1321bfe
grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents:
2868
diff
changeset
|
21 port:2:1:+:spam:export |
8eaaf1321bfe
grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents:
2868
diff
changeset
|
22 port:2:2:+:spam:vaportight |
8eaaf1321bfe
grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents:
2868
diff
changeset
|
23 port:2:3:+:spam:import/export |
8eaaf1321bfe
grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents:
2868
diff
changeset
|
24 port:1:2:+:eggs:export |
8eaaf1321bfe
grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents:
2868
diff
changeset
|
25 port:0:1:+:eggs:import |