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-ro-message
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 04 Oct 2007 23:21:37 -0300
changeset 5374 e710874247d1
parent 2283 e506c14382fd
permissions -rwxr-xr-x
convert: allow the converter_source to say "skip this revision" If getchanges returns a string, it's assumed to be the id of an already converted revision. We map the current revision to the same revision this converted revision was mapped to. To allow skipping a root revision, getchanges can return the special string 'hg-convert-skipped-revision' (a.k.a. common.SKIPREV), which hopefully won't clash with any real id. The converter_source is responsible for rewriting the parents of the commit objects to make sure the revision graph makes sense.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1355
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
     1
 
#!/bin/sh
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
     2
 
HG=hg
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
     3
 
"$HG" init
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
     4
 
mkdir b
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
     5
 
echo 'Bouncy' >b/bouncy
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
     6
 
echo 'tricycle' >b/vehicle
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
     7
 
"$HG" add b/bouncy
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
     8
 
"$HG" add b/vehicle
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
     9
 
"$HG" commit -m 'Adding bouncy'
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
    10
 
echo 'bouncy' >>b/bouncy
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
    11
 
"$HG" commit -m 'Making it bouncier'
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
    12
 
"$HG" update -C 0
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
    13
 
echo 'stationary' >>b/vehicle
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
    14
 
"$HG" commit -m 'Clarifying the vehicle.'
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
    15
 
"$HG" update -C 1
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
    16
 
chmod a-w b/vehicle
2283
e506c14382fd deprecate 'update -m'. use 'merge' instead.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1738
diff changeset 
    17
 
"$HG" merge 2 2>&1 | sed 's|^\(.*[ 	]\).*/\([^/]*/[^/]*/[^/]*\)$|\1\2|g'
Mercurial