view tests/test-walk.out @ 3295:764688cf51e5

merge: remember rename copies and parents properly on commit record copies in dirstate even if rename was remote this lets us record it properly at commit teach checkfilemerge about copies, including merge cases pull old copy code out of commit extend rename-merge1 test to show file index
author Matt Mackall <mpm@selenic.com>
date Sun, 08 Oct 2006 19:57:45 -0500
parents 9d1c3529ebbc
children 01c4ea5e788c c93562fb12cc
line wrap: on
line source

adding beans/black
adding beans/borlotti
adding beans/kidney
adding beans/navy
adding beans/pinto
adding beans/turtle
adding fennel
adding fenugreek
adding fiddlehead
adding glob:glob
adding mammals/Procyonidae/cacomistle
adding mammals/Procyonidae/coatimundi
adding mammals/Procyonidae/raccoon
adding mammals/skunk
f  beans/black                     beans/black
f  beans/borlotti                  beans/borlotti
f  beans/kidney                    beans/kidney
f  beans/navy                      beans/navy
f  beans/pinto                     beans/pinto
f  beans/turtle                    beans/turtle
f  fennel                          fennel
f  fenugreek                       fenugreek
f  fiddlehead                      fiddlehead
f  glob:glob                       glob:glob
f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
f  mammals/skunk                   mammals/skunk
f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
f  mammals/skunk                   skunk
f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
f  mammals/Procyonidae/cacomistle  cacomistle
f  mammals/Procyonidae/coatimundi  coatimundi
f  mammals/Procyonidae/raccoon     raccoon
f  mammals/Procyonidae/cacomistle  cacomistle
f  mammals/Procyonidae/coatimundi  coatimundi
f  mammals/Procyonidae/raccoon     raccoon
f  mammals/skunk                   ../skunk
f  beans/black     ../beans/black
f  beans/borlotti  ../beans/borlotti
f  beans/kidney    ../beans/kidney
f  beans/navy      ../beans/navy
f  beans/pinto     ../beans/pinto
f  beans/turtle    ../beans/turtle
f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
f  mammals/skunk                   skunk
.hg: No such file or directory
abort: path contains illegal component: .hg

f  beans/black     beans/black
f  beans/borlotti  beans/borlotti
f  beans/kidney    beans/kidney
f  beans/navy      beans/navy
f  beans/pinto     beans/pinto
f  beans/turtle    beans/turtle
f  beans/black     beans/black
f  beans/borlotti  beans/borlotti
f  mammals/skunk  mammals/skunk
f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
f  mammals/skunk                   mammals/skunk
abort: .. not under root
abort: beans/../.. not under root
abort: path contains illegal component: .hg

abort: path contains illegal component: .hg

abort: path contains illegal component: .hg/data

beans/.hg: No such file or directory
f  fennel      fennel
f  fenugreek   fenugreek
f  fiddlehead  fiddlehead
f  glob:glob   glob:glob
f  beans/black    beans/black
f  fenugreek      fenugreek
f  glob:glob      glob:glob
f  mammals/skunk  mammals/skunk
f  beans/black  beans/black
f  beans/black     beans/black
f  beans/borlotti  beans/borlotti
f  beans/kidney    beans/kidney
f  beans/navy      beans/navy
f  beans/pinto     beans/pinto
f  beans/turtle    beans/turtle
NOEXIST: No such file or directory
fifo: unsupported file type (type is fifo)
m  fenugreek  fenugreek  exact
m  fenugreek  fenugreek  exact
f  new  new  exact