tests/test-subrepo-git.t
branchstable
changeset 17255 3e856d8abe9c
parent 17114 ca75bd99f740
child 17345 4f8054d3171b
equal deleted inserted replaced
17254:0deb66d4ad81 17255:3e856d8abe9c
   428   $ touch s/f1
   428   $ touch s/f1
   429   $ cd s
   429   $ cd s
   430   $ git add f1
   430   $ git add f1
   431   $ cd ..
   431   $ cd ..
   432   $ hg id -n
   432   $ hg id -n
   433   1
   433   1+
   434   $ cd s
   434   $ cd s
   435   $ git rev-parse HEAD
   435   $ git rev-parse HEAD
   436   da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7
   436   da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7
   437   $ cd ..
   437   $ cd ..
   438   $ hg update 4
   438   $ hg update 4
   485    subrepository sources for s differ
   485    subrepository sources for s differ
   486   use (l)ocal source (32a3438) or (r)emote source (32a3438)?
   486   use (l)ocal source (32a3438) or (r)emote source (32a3438)?
   487    l
   487    l
   488   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   488   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   489   $ hg id -n
   489   $ hg id -n
   490   7
   490   7+
   491   $ cd s
   491   $ cd s
   492   $ git rev-parse HEAD
   492   $ git rev-parse HEAD
   493   aa84837ccfbdfedcdcdeeedc309d73e6eb069edc
   493   aa84837ccfbdfedcdcdeeedc309d73e6eb069edc
   494   $ cd ..
   494   $ cd ..
   495 
   495