tests/test-unrelated-pull.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 09 Jun 2007 01:04:28 -0300
changeset 4531 b51a8138292a
parent 3621 8c4fd0de5de8
permissions -rw-r--r--
Avoid extra filelogs entries. Right now, there are some situations in which localrepo.filecommit can create filelog entries even though they're not needed. For example: - permissions for a file have changed; - qrefresh can create a filelog entry identical to its parent (see the added test); - convert-repo creates extra filelog entries in every merge where the first parent has added files (for example, changeset ebebe9577a1a of the kernel repo added extra filelog entries to files in the arch/blackfin directory, even though the merge should only touch the drivers/ata directory). This makes "hg log file" in a converted repo less useful than it could be, since it may mention many merges that don't actually touch that specific file. They all come from the same basic problem: localrepo.commit (through filecommit) creates new filelog entries for all files passed to it (except for some cases during a merge). Patch and test case provided by Benoit. This should fix issue351.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
     1
pulling from ../a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
     2
searching for changes
1960
dac4bd67f6c5 update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
     3
abort: repository is unrelated
dac4bd67f6c5 update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
     4
pulling from ../a
dac4bd67f6c5 update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
     5
searching for changes
dac4bd67f6c5 update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
     6
warning: repository is unrelated
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
     7
adding changesets
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
     8
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 579
diff changeset
     9
adding file changes
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    10
added 1 changesets with 1 changes to 1 files (+1 heads)
2019
ced2d3620f95 add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1960
diff changeset
    11
(run 'hg heads' to see heads, 'hg merge' to merge)
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1043
diff changeset
    12
changeset:   1:bdcee5d51fa6
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
    13
tag:         tip
3621
8c4fd0de5de8 Fix up parent display in logging
Matt Mackall <mpm@selenic.com>
parents: 2019
diff changeset
    14
parent:      -1:000000000000
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
    15
user:        a
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1043
diff changeset
    16
date:        Mon Jan 12 13:46:40 1970 +0000
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
    17
summary:     a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
    18
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1043
diff changeset
    19
changeset:   0:f155ba1aa5ba
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
    20
user:        b
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1043
diff changeset
    21
date:        Mon Jan 12 13:46:40 1970 +0000
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
    22
summary:     b
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
    23