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.out
author mason@suse.com
Tue, 13 Sep 2005 19:32:43 -0500
changeset 1237 227cfbe34109
parent 1043 9344f5dd4488
child 1933 7544700fd931
permissions -rw-r--r--
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:
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     1
 
pulling from ../a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     2
 
searching for changes
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     3
 
warning: pulling from an unrelated repository!
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     4
 
adding changesets
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     5
 
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 579
diff changeset 
     6
 
adding file changes
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset 
     7
 
added 1 changesets with 1 changes to 1 files (+1 heads)
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     8
 
(run 'hg update' to get a working copy)
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 775
diff changeset 
     9
 
changeset:   1:9a79c33a9db3
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    10
 
tag:         tip
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    11
 
user:        a
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset 
    12
 
date:        Thu Jan  1 00:00:00 1970 +0000
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    13
 
summary:     a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    14
 







784






853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes



mpm@selenic.com


parents: 
775

diff
changeset




    15


changeset:   0:01f8062b2de5








579






ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    16


user:        b








967






1f3710636b45
[PATCH] Print timezone offset when outputting dates



Samuel Tardieu <sam@rfc1149.net>


parents: 
925

diff
changeset




    17


date:        Thu Jan  1 00:00:00 1970 +0000








579






ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    18


summary:     b













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    19
















mercurial-crew-with-dirclash