Mercurial Mercurial > mercurial / 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-convert-bzr-merges
author Mads Kiilerich <mads@kiilerich.com>
Tue, 29 Jun 2010 12:12:34 +0200
branchstable
changeset 11488 f786fc4b8764
parent 8084 5b3fee9c1f4d
permissions -rwxr-xr-x
log: follow filenames through renames (issue647) In commands.log a displayer was initialized from cmdutil.show_changeset() with the initial matchfn (which designates the specified files which only is correct in the highest revision in the range). prep() is handed the correct list of files, but displayer.show() didn't use that list but keept using the original matchfn. The matchfn argument to cmdutil.show_changeset() wasn't specified in other places and is only used in .show(), so now we give the matchfn as an optional parameter to .show(). We do however still have to detect --patch and --stat from opts in show_changeset() and let it imply a matchall, but that can now be overruled with the new .show() matchfn parameter.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
     1
 
#!/bin/sh
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
     2
 







8084






5b3fee9c1f4d
Add comment about this test failing under bzr 1.13 due to a bug in bzr.



Greg Ward <greg-hg@gerg.ca>


parents: 
7604

diff
changeset




     3


# N.B. bzr 1.13 has a bug that breaks this test.  If you see this












5b3fee9c1f4d
Add comment about this test failing under bzr 1.13 due to a bug in bzr.



Greg Ward <greg-hg@gerg.ca>


parents: 
7604

diff
changeset




     4


# test fail, check your bzr version.  Upgrading to bzr 1.13.1












5b3fee9c1f4d
Add comment about this test failing under bzr 1.13 due to a bug in bzr.



Greg Ward <greg-hg@gerg.ca>


parents: 
7604

diff
changeset




     5


# should fix it.












5b3fee9c1f4d
Add comment about this test failing under bzr 1.13 due to a bug in bzr.



Greg Ward <greg-hg@gerg.ca>


parents: 
7604

diff
changeset




     6









7058






9e6d6568bf7a
`source` doesn't work for some /bin/sh, use `.` instead



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
7053

diff
changeset




     7


. "$TESTDIR/bzr-definitions"







7053






209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




     8














209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




     9


echo % test multiple merges at once












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    10


mkdir test-multimerge












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    11


cd test-multimerge












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    12


bzr init -q source












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    13


cd source












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    14


echo content > file












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    15


bzr add -q file












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    16


bzr commit -q -m 'Initial add'












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    17


cd ..












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    18


bzr branch -q source source-branch1












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    19


cd source-branch1












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    20


echo morecontent >> file












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    21


echo evenmorecontent > file-branch1












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    22


bzr add -q file-branch1












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    23


bzr commit -q -m 'Added branch1 file'












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    24


cd ../source







7604






7c4765d51c3c
tests: shrink wait interval for test-convert-bzr-merges



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
7602

diff
changeset




    25


sleep 1







7053






209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    26


echo content > file-parent












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    27


bzr add -q file-parent












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    28


bzr commit -q -m 'Added parent file'












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    29


cd ..












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    30


bzr branch -q source source-branch2












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    31


cd source-branch2












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    32


echo somecontent > file-branch2












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    33


bzr add -q file-branch2












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    34


bzr commit -q -m 'Added brach2 file'







7604






7c4765d51c3c
tests: shrink wait interval for test-convert-bzr-merges



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
7602

diff
changeset




    35


sleep 1







7053






209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    36


cd ../source












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    37


bzr merge -q ../source-branch1












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    38


bzr merge -q --force ../source-branch2












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    39


bzr commit -q -m 'Merged branches'












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    40


cd ..












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    41


hg convert --datesort source source-hg












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    42


glog -R source-hg












209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    43


manifest source-hg tip














mercurial