Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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-merge4
author mason@suse.com
Tue, 13 Sep 2005 19:32:43 -0500
changeset 1237 227cfbe34109
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
Fix off by one in convert-repo tags --- crew.orig/contrib/convert-repo 2005-07-16 11:52:06.000000000 -0400 +++ crew/contrib/convert-repo 2005-09-02 02:58:14.000000000 -0400 @@ -86,9 +86,7 @@ class convert_git: for f in os.listdir(self.path + "/.git/refs/tags"): try: h = file(self.path + "/.git/refs/tags/" + f).read().strip() - p, a, d, m = self.getcommit(h) - if not p: p = [h] # git is ugly, don't blame me - tags[f] = p[0] + tags[f] = h except: pass return tags -- _______________________________________________ Mercurial mailing list Mercurial@selenic.com http://selenic.com/mailman/listinfo/mercurial
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
800
ec85f9e6f3b1 Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
     1
 
#!/bin/sh
416
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset 
     2
 












5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




     3


hg init













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




     4


echo This is file a1 > a













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




     5


hg add a








749






7e4843b7efd2
Update tests to use commit -m and default -u



mpm@selenic.com


parents: 
416

diff
changeset




     6


hg commit -m "commit #0" -d "0 0"








416






5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




     7


echo This is file b1 > b













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




     8


hg add b








749






7e4843b7efd2
Update tests to use commit -m and default -u



mpm@selenic.com


parents: 
416

diff
changeset




     9


hg commit -m "commit #1" -d "0 0"








416






5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




    10


hg update 0













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




    11


echo This is file c1 > c













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




    12


hg add c








749






7e4843b7efd2
Update tests to use commit -m and default -u



mpm@selenic.com


parents: 
416

diff
changeset




    13


hg commit -m "commit #2" -d "0 0"








416






5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




    14


hg update -m 1













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




    15


rm b













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




    16


echo This is file c22 > c








749






7e4843b7efd2
Update tests to use commit -m and default -u



mpm@selenic.com


parents: 
416

diff
changeset




    17


hg commit -m "commit #3" -d "0 0"















mercurial-crew-with-dirclash