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-unrelated-pull
author mason@suse.com
Tue, 13 Sep 2005 19:32:43 -0500
changeset 1237 227cfbe34109
parent 814 0902ffece4b4
child 1308 2073e5a71008
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:
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 579
diff changeset 
     1
 
#!/bin/sh
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 579
diff changeset 
     2
 







579






ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




     3


mkdir a













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




     4


cd a













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




     5


hg init













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




     6


echo 123 > a













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




     7


hg add a








749






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



mpm@selenic.com


parents: 
579

diff
changeset




     8


hg commit -m "a" -u a -d "0 0"








579






ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




     9














ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    10


cd ..













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    11


mkdir b













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    12


cd b













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    13


hg init 













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    14


echo 321 > b













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    15


hg add b








749






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



mpm@selenic.com


parents: 
579

diff
changeset




    16


hg commit -m "b" -u b -d "0 0"








579






ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    17














ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    18


hg pull ../a













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    19


hg heads















mercurial-crew-with-dirclash