Mercurial > hg
view tests/test-subrepo-deep-nested-change @ 11715:4f9dfb54c8b5 stable
qpush --move: move the right patch even with comment lines
88fc876a4833 caused that we find the index of the moving patch in self.series
but look it up in self.full_series. The difference between these is that
full_series also contains comment lines, and we thus moved the wrong patch.
Use back self.full_series to find the moving patch, but take care of striping
the patch guard markers before comparing the patch name. Test cases have been
added for comments and empty lines in self.full_series, and for the case of
guarded patches.
Original patch contributed by Mads Kiilerich <mads@kiilerich.com>
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Sat, 10 Jul 2010 21:23:00 +0200 |
parents | 22f5ad0b5857 |
children |
line wrap: on
line source
#!/bin/sh echo % Preparing the subrepository 'sub2' hg init sub2 echo sub2 > sub2/sub2 hg add -R sub2 hg commit -R sub2 -m "sub2 import" echo % Preparing the 'sub1' repo which depends on the subrepo 'sub2' hg init sub1 echo sub1 > sub1/sub1 echo "sub2 = ../sub2" > sub1/.hgsub hg clone sub2 sub1/sub2 | sed 's/ .*sub/ ...sub/g' hg add -R sub1 hg commit -R sub1 -m "sub1 import" echo % Preparing the 'main' repo which depends on the subrepo 'sub1' hg init main echo main > main/main echo "sub1 = ../sub1" > main/.hgsub hg clone sub1 main/sub1 | sed 's/ .*sub/ ...sub/g' hg add -R main hg commit -R main -m "main import" echo % Cleaning both repositories, just as a clone -U hg up -C -R sub2 null hg up -C -R sub1 null hg up -C -R main null rm -rf main/sub1 rm -rf sub1/sub2 echo % Clone main hg clone main cloned | sed 's/ .*sub/ ...sub/g' echo % Checking cloned repo ids printf "cloned " ; hg id -R cloned printf "cloned/sub1 " ; hg id -R cloned/sub1 printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2 echo % debugsub output for main and sub1 hg debugsub -R cloned hg debugsub -R cloned/sub1 echo % Modifying deeply nested 'sub2' echo modified > cloned/sub1/sub2/sub2 hg commit -m "deep nested modif should trigger a commit" -R cloned echo % Checking modified node ids printf "cloned " ; hg id -R cloned printf "cloned/sub1 " ; hg id -R cloned/sub1 printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2 echo % debugsub output for main and sub1 hg debugsub -R cloned hg debugsub -R cloned/sub1 exit 0