Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-issue672.out
author Martin Geisler <mg@lazybytes.net>
Fri, 19 Jun 2009 10:30:18 +0200
changeset 8910 0c610f77ae1a
parent 8753 af5f099d932b
child 10431 ba5e508b5e92
permissions -rw-r--r--
interhg: escape backslashes in docstring
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5096
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     1
 
adding 1
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     2
 
adding 2
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     3
 
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset 
     4
 
created new head
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
     5
 
  searching for copies back to rev 1
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
     6
 
  unmatched files in other:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
     7
 
   1a
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
     8
 
  all copies found (* = to merge, ! = divergent):
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
     9
 
   1a -> 1
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
    10
 
  checking for directory renames
8753
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 8748
diff changeset 
    11
 
resolving manifests
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 8748
diff changeset 
    12
 
 overwrite None partial False
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 8748
diff changeset 
    13
 
 ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c
5096
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    14
 
 1: other deleted -> r
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    15
 
 1a: remote created -> g
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    16
 
removing 1
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    17
 
getting 1a
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    18
 
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    19
 
(branch merge, don't forget to commit)
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    20
 
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset 
    21
 
created new head
5096
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    22
 
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
    23
 
  searching for copies back to rev 1
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
    24
 
  unmatched files in local:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
    25
 
   1a
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
    26
 
  all copies found (* = to merge, ! = divergent):
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
    27
 
   1a -> 1 *
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
    28
 
  checking for directory renames
8753
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 8748
diff changeset 
    29
 
resolving manifests
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 8748
diff changeset 
    30
 
 overwrite None partial False
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 8748
diff changeset 
    31
 
 ancestor c64f439569a9 local ac7575e3c052+ remote 746e9549ea96
8748
f325574dad1a merge: combine a copy and move case
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    32
 
 1a: local copied/moved to 1 -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset 
    33
 
preserving 1a for resolve of 1a
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5810
diff changeset 
    34
 
picked tool 'internal:merge' for 1a (binary False symlink False)
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset 
    35
 
merging 1a and 1 to 1a
5096
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    36
 
my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5810
diff changeset 
    37
 
 premerge successful
5096
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    38
 
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    39
 
(branch merge, don't forget to commit)
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    40
 
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
    41
 
  searching for copies back to rev 1
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
    42
 
  unmatched files in other:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
    43
 
   1a
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
    44
 
  all copies found (* = to merge, ! = divergent):
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
    45
 
   1a -> 1 *
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset 
    46
 
  checking for directory renames
8753
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 8748
diff changeset 
    47
 
resolving manifests
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 8748
diff changeset 
    48
 
 overwrite None partial False
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 8748
diff changeset 
    49
 
 ancestor c64f439569a9 local 746e9549ea96+ remote ac7575e3c052
5096
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    50
 
 1: remote moved to 1a -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset 
    51
 
preserving 1 for resolve of 1a
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset 
    52
 
removing 1
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset 
    53
 
picked tool 'internal:merge' for 1a (binary False symlink False)
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset 
    54
 
merging 1 and 1a to 1a
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset 
    55
 
my 1a@746e9549ea96+ other 1a@ac7575e3c052 ancestor 1@81f4b099af3d
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5810
diff changeset 
    56
 
 premerge successful
5096
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    57
 
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    58
 
(branch merge, don't forget to commit)
Mercurial