[Svnmerge] revision lists

[Konstantin Sobolev]

On 11/25/06, Blair Zajac <blair at orcaware.com> wrote:

> When you run the init without -r, then do a 'svn pl -v .', what does
> it show?

Without -r it doesn't seem to notice when the branch was created.
Here's a transcript of locally made test:

kos at kos ~/work/test $ svn checkout svn://localhost/repos/test
A    test/trunk
A    test/trunk/proj_a
A    test/trunk/proj_a/test.txt
A    test/trunk/proj_b
A    test/branches
Checked out revision 59.
kos at kos ~/work/test $ cd test/trunk/proj_a
kos at kos ~/work/test/test/trunk/proj_a $ echo "before split" >> test.txt
kos at kos ~/work/test/test/trunk/proj_a $ svn ci -m "before split"
Sending        proj_a/test.txt
Transmitting file data .
Committed revision 60.
kos at kos ~/work/test/test/trunk/proj_a $ svn copy
svn://localhost/repos/test/trunk
svn://localhost/repos/test/branches/test-branch -m "branch create"

Committed revision 61.
kos at kos ~/work/test/test/trunk/proj_a $ echo "after split" >>| test.txt
kos at kos ~/work/test/test/trunk/proj_a $ svn ci -m "after split"
Sending        proj_a/test.txt
Transmitting file data .
Committed revision 62.
kos at kos ~/work/test/test/trunk/proj_a $ cd ../..
kos at kos ~/work/test/test $ svn update
A    branches/test-branch
A    branches/test-branch/proj_a
A    branches/test-branch/proj_a/test.txt
A    branches/test-branch/proj_b
Updated to revision 62.
kos at kos ~/work/test/test $ cd branches/test-branch/proj_a
kos at kos ~/work/test/test/branches/test-branch/proj_a $ svnmerge.py init
svnmerge: no copyfrom info available. Explicit head argument
(-S/--head) required.
kos at kos ~/work/test/test/branches/test-branch/proj_a $ svnmerge.py
init svn://localhost/repos/test/trunk/proj_a
property 'svnmerge-integrated' set on '.'
kos at kos ~/work/test/test/branches/test-branch/proj_a $ svn ci -F
svnmerge-commit-message.txt && rm svnmerge-commit-message.txt
Sending        proj_a

Committed revision 63.
kos at kos ~/work/test/test/branches/test-branch/proj_a $ svnmerge.py avail
<no output!>
kos at kos ~/work/test/test/branches/test-branch/proj_a $ svnmerge.py avail -v -v
svn propget --strict "svnmerge-integrated" "."
svnmerge: calculate head path for the branch
svn info "."
svnmerge: head is "svn://localhost/repos/test/trunk/proj_a"
svn info "svn://localhost/repos/test/branches/test-branch/proj_a"
svn info "svn://localhost/repos/test/trunk/proj_a"
svn log --quiet -r63:63 "svn://localhost/repos/test/trunk/proj_a"
svnmerge: skipping phantom revisions: 63
svn propget --strict "svnmerge-blocked" "."
kos at kos ~/work/test/test/branches/test-branch/proj_a $ svn pl -v .
Properties on '.':
  svnmerge-integrated : /test/trunk/proj_a:1-62

-- 
/KoS