Mercurial > hg
comparison tests/test-flags.out @ 412:40cfa2d0c088
[PATCH]: Typo in localrepository.update
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH]: Typo in localrepository.update
From: Goffredo Baroncelli <kreijack@libero.it>
I think that there is an error in the method update() of the class
localrepository. The variable 'm2n' was used instead of 'man'; so the
parent2 flags is computed instead of the ancestor flags.
manifest hash: dc11810367615245c4b39660d135ab3c0e71b85d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuNWpywK+sNU5EO8RAv9ZAKCxwbd242xZQ1CCrW2WDdQ4gclKtACghXYl
7j1YTRpINItwdXzak3cBS60=
=+Tf8
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 21 Jun 2005 19:06:17 -0800 |
parents | |
children | 291a62848f54 |
comparison
equal
deleted
inserted
replaced
411:9e9f7ab43ce2 | 412:40cfa2d0c088 |
---|---|
1 pulling from ../test1 | |
2 requesting all changes | |
3 adding changesets | |
4 adding manifests | |
5 adding file revisions | |
6 modified 2 files, added 1 changesets and 2 new revisions | |
7 (run 'hg update' to get a working copy) | |
8 -rw-r--r-- 1 oxymoron oxymoron 4 Jun 22 03:04 ../test1/a | |
9 -rwxr-xr-x 1 oxymoron oxymoron 0 Jun 22 03:04 ../test2/a | |
10 pulling from ../test2 | |
11 searching for changes | |
12 adding changesets | |
13 adding manifests | |
14 adding file revisions | |
15 modified 1 files, added 1 changesets and 1 new revisions | |
16 (run 'hg update' to get a working copy) | |
17 changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 | |
18 tag: tip | |
19 parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 | |
20 user: test | |
21 date: Thu Jan 1 00:00:00 1970 | |
22 summary: chmod +x a | |
23 | |
24 changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 | |
25 user: test | |
26 date: Thu Jan 1 00:00:00 1970 | |
27 summary: a updated | |
28 | |
29 changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 | |
30 tag: tip | |
31 parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 | |
32 user: test | |
33 date: Thu Jan 1 00:00:00 1970 | |
34 summary: chmod +x a | |
35 | |
36 changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 | |
37 user: test | |
38 date: Thu Jan 1 00:00:00 1970 | |
39 summary: a updated | |
40 | |
41 changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7 | |
42 user: test | |
43 date: Thu Jan 1 00:00:00 1970 | |
44 summary: added a b | |
45 | |
46 resolving manifests | |
47 ancestor f328b97f7c11 local e7f06daf1cdb remote 629f0b785e0e | |
48 a versions differ, resolve | |
49 merging a | |
50 resolving a | |
51 file a: other 37c42bd6cc03 ancestor b80de5d13875 | |
52 -rwxr-xr-x | |
53 -rwxr-xr-x |