Source

hg-importfs / test-importfs-two-sources.t

Full commit
Load the extension:

  $ echo "[extensions]" >> $HGRCPATH
  $ echo "importfs = $TESTDIR/importfs.py" >> $HGRCPATH

Create a basic file structure:

  $ mkdir -p d1/d2
  $ echo "c1" > d1/f1
  $ echo "c3" > d1/d2/f3
  $ echo "c4" > d1/d2/f4

Provoke an error by using a non existent second directory for an import:

  $ hg importfs r d1 d3
  abort: directory d3 does not exist
  [255]

Create the rest of the filesystem structure:

  $ mkdir d3
  $ echo "c5" > d3/f5
  $ echo "c6" > d3/f6

Perform an import with two source directories:

  $ hg importfs r d1 d3
  created repository $TESTTMP/r
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  adding d2/f3
  adding d2/f4
  adding f1
  adding f5
  adding f6

If the same files exist in both directory structures the last directory wins:

  $ echo "c7" > d3/f1
  $ hg importfs r d1 d3
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

Check the log:

  $ hg -R r log -vpr tip
  changeset:   1:???????????? (glob)
  tag:         tip
  user:        test
  date:        ??? ??? ?? ??:??:?? ???? +???? (glob)
  files:       f1
  description:
  importfs commit.
  
  
  diff -r ???????????? -r ???????????? f1 (glob)
  --- a/f1	??? ??? ?? ??:??:?? ???? +???? (glob)
  +++ b/f1	??? ??? ?? ??:??:?? ???? +???? (glob)
  @@ -1,1 +1,1 @@
  -c1
  +c7