Mercurial > hg
annotate tests/test-issue522.out @ 6403:f615ece5fec3
hgweb: remove dead code
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 29 Mar 2008 21:15:34 +0100 |
parents | e7ed5d07cc4c |
children | af5f099d932b |
rev | line source |
---|---|
5210
90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
1 reverting foo |
90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e |
90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
4 resolving manifests |
90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 overwrite None partial False |
90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
6 ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee |
5371
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5210
diff
changeset
|
7 searching for copies back to rev 1 |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5210
diff
changeset
|
8 unmatched files in local: |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5210
diff
changeset
|
9 bar |
5210
90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 foo: remote is newer -> g |
90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
11 getting foo |
90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
13 (branch merge, don't forget to commit) |
5858
e7ed5d07cc4c
Display debugstate dates as '%Y-%m-%d %H:%M:%S'
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
5405
diff
changeset
|
14 n 0 -2 unset foo |
5210
90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
15 M foo |
5405
8feb33c2d153
Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents:
5371
diff
changeset
|
16 c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo |
5210
90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
17 rev offset length base linkrev nodeid p1 p2 |
90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
18 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 |
90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
19 1 5 9 1 1 6f4310b00b9a 2ed2a3912a0b 000000000000 |
90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
20 2 14 5 2 2 c6fc755d7e68 6f4310b00b9a 000000000000 |