annotate tests/test-conflict @ 393:e3f564643888
hg init: add -u flag to update
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg init: add -u flag to update
From: Andrew Thompson <andrewkt@aktzero.com>
I was trying to get init to run update by passing an option. The basic
part works, but if you use the -u option, you have to specify the
changeset number, tag, or tip. Anyone see a way to make this work easier?
(minor tweaks by mpm)
manifest hash: 9e39e822693e1f175cd5e02a8d4a984d82afbd92
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCswJaywK+sNU5EO8RAuILAJ42ZVtnHnlbq/xz6SxhaWLtI4KZ/QCgqS6F
6EDjkfy1F8dmBTf8Ob3ac/s=
=f3WC
-----END PGP SIGNATURE-----
author |
mpm@selenic.com |
date |
Fri, 17 Jun 2005 09:03:22 -0800 |
parents |
ee4c80d294e5 |
children |
3d4d5f2aba9a 4fc63e22b1fe |
rev |
line source |
346
|
1 #!/bin/bash
|
|
2
|
|
3 set -x
|
|
4 hg init
|
|
5 echo "nothing" > a
|
|
6 hg add a
|
|
7 hg commit -t ancestor -u test -d "0 0"
|
|
8 echo "something" > a
|
|
9 hg commit -t branch1 -u test -d "0 0"
|
|
10 hg co 0
|
|
11 echo "something else" > a
|
|
12 hg commit -t branch2 -u test -d "0 0"
|
|
13 export HGMERGE=merge
|
|
14 hg -d up -m 1
|
|
15 hg id
|
392
|
16 grep -Ev ">>>|<<<" a
|
346
|
17 hg status
|