tests/test-issue1175
author Sune Foldager <cryo@cyanite.org>
Thu, 15 Apr 2010 21:59:21 +0200
branchstable
changeset 10925 a101a743c570
parent 6875 0d714a48ab53
permissions -rwxr-xr-x
prepush: rewrite most of the code from scratch For servers with branchmap support, the algorithm now works as follows: 1. A list of branches in outgoing changesets is created. 2. Using the remote branchmap, a check for new branches is performed. 3. A map (from branch to head list) of locally known remote heads before the push is created, and one which, after step 4, will contain the locally known remote heads after the push. 4. The post-push head map is updated with the outgoing changesets, using the branch cache update mechanism. 5. A check for new heads is performed, by comparing the length of the head list before and after push, for each branch. If there are new heads, an error depending on whether or not there are incoming changes on the branch, is returned. 6. If the push is allowed, a warning is written if there are incoming changes on any branches involved in the push. For old servers, an algorithm similar to step 4-6 above is used to check for new topological heads only. Two bugs are also fixed: 1. Sometimes you would be allowed to push new branch heads without --force. A test for this case was added. 2. You would get the "note: unsynced remote changes!" warning if there were any incoming changesets, even if they were on unrelated branches.
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
#!/bin/sh
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     2
rm -rf a
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     3
hg init a
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     4
cd a
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     5
touch a
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     6
hg ci -Am0
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     7
hg mv a a1
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     8
hg ci -m1
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     9
hg co 0
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    10
hg mv a a2
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    11
hg up
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    12
hg ci -m2
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    13
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    14
touch a
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    15
hg ci -Am3
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    16
hg mv a b
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    17
hg ci -Am4 a
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    18
hg ci --debug --traceback -Am5 b
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    19
hg verify
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    20
hg export --git tip