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-issue1175.out
author Matt Mackall <mpm@selenic.com>
Wed, 30 Jun 2010 23:56:35 -0500
branchstable
changeset 11470 34e33d50c26b
parent 10490 f2618cacb485
permissions -rw-r--r--
subrepo: correctly handle update -C with modified subrepos (issue2022) (based on a patch by Saint Germain)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6875
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     1
 
adding a
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     2
 
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     3
 
warning: detected divergent renames of a to:
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     4
 
 a2
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     5
 
 a1
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     6
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     7
 
adding a
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     8
 
b
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     9
 
 b: searching for copy revision for a
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    10
 
 b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 6935
diff changeset 
    11
 
committed changeset 5:89e8e4be0de296fa3d6dd7825ccc44d7dc0f1f3b
6875
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    12
 
checking changesets
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    13
 
checking manifests
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    14
 
crosschecking files in changesets and manifests
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    15
 
checking files
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    16
 
4 files, 6 changesets, 4 total revisions
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    17
 
# HG changeset patch
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    18
 
# User test
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    19
 
# Date 0 0
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 6935
diff changeset 
    20
 
# Node ID 89e8e4be0de296fa3d6dd7825ccc44d7dc0f1f3b
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 6935
diff changeset 
    21
 
# Parent  7fc86ba705e717a721dbc361bf8c9bc05a18ca2f
6875
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    22
 
5
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    23
 












0d714a48ab53
add a fix for issue 1175



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    24


diff --git a/b b/b













0d714a48ab53
add a fix for issue 1175



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    25


new file mode 100644















Mercurial