Help with constant conflicts

[K.L.]

Hi,

Having problems with merge.


me@localhost /srv/www $ svn ls svn+ssh://example.com/var/svn/svnbugs
me@localhost /srv/www $ svn mkdir svn+ssh://example.com/var/svn/svnbugs/trunk

Log message unchanged or not specified
(a)bort, (c)ontinue, (e)dit:
c

Committed revision 1.
me@localhost /srv/www $ svn ls svn+ssh://example.com/var/svn/svnbugs
trunk/
me@localhost /srv/www $ svn mkdir svn+ssh://example.com/var/svn/svnbugs/branches

Log message unchanged or not specified
(a)bort, (c)ontinue, (e)dit:
c

Committed revision 2.
me@localhost /srv/www $ svn ls svn+ssh://example.com/var/svn/svnbugs
branches/
trunk/
me@localhost /srv/www $ svn co svn+ssh://example.com/var/svn/svnbugs
Asvnbugs/trunk
Asvnbugs/branches
Checked out revision 2.
me@localhost /srv/www $ cd svnbugs/
me@localhost /srv/www/svnbugs $ ls -la
total 20
drwxr-xr-x  5 me me 4096 May 13 13:26 .
drwxrwxrwx 26 me wheel 4096 May 13 13:26 ..
drwxr-xr-x  6 me me 4096 May 13 13:26 .svn
drwxr-xr-x  3 me me 4096 May 13 13:26 branches
drwxr-xr-x  3 me me 4096 May 13 13:26 trunk
me@localhost /srv/www/svnbugs $ mkdir trunk/dir1
me@localhost /srv/www/svnbugs $ svn st
?   trunk/dir1
me@localhost /srv/www/svnbugs $ svn add trunk/dir1/
A trunk/dir1
me@localhost /srv/www/svnbugs $ svn commit -m "" trunk/dir1/
Adding trunk/dir1

Committed revision 3.
me@localhost /srv/www/svnbugs $ svn cp
svn+ssh://example.com/var/svn/svnbugs/trunk
svn+ssh://example.com/var/svn/svnbugs/branches/branch1

Log message unchanged or not specified
(a)bort, (c)ontinue, (e)dit:
c

Committed revision 4.
me@localhost /srv/www/svnbugs $ svn up
Abranches/branch1
Abranches/branch1/dir1
Updated to revision 4.
me@localhost /srv/www/svnbugs $ mkdir trunk/dir2
me@localhost /srv/www/svnbugs $ svn st
?   trunk/dir2
me@localhost /srv/www/svnbugs $ svn add trunk/dir2
A trunk/dir2
me@localhost /srv/www/svnbugs $ svn commit -m "" trunk/dir2
Adding trunk/dir2

Committed revision 5.
me@localhost /srv/www/svnbugs $ cd branches/branch1/
me@localhost /srv/www/svnbugs/branches/branch1 $ svn st
me@localhost /srv/www/svnbugs/branches/branch1 $ svn up
At revision 5.
me@localhost /srv/www/svnbugs/branches/branch1 $ svn merge
svn+ssh://example.com/var/svn/svnbugs/trunk
--- Merging r4 through r5 into '.':
Adir2
me@localhost /srv/www/svnbugs/branches/branch1 $ svn st
 M  .
A  +dir2
me@localhost /srv/www/svnbugs/branches/branch1 $ svn commit -m "merged @5"
Sendingbranch1
Adding branch1/dir2

Committed revision 6.
me@localhost /srv/www/svnbugs/branches/branch1 $ svn st
me@localhost /srv/www/svnbugs/branches/branch1 $ svn up
At revision 6.
me@localhost /srv/www/svnbugs/branches/branch1 $ ls
dir1  dir2
me@localhost /srv/www/svnbugs/branches/branch1 $ mkdir dir3
me@localhost /srv/www/svnbugs/branches/branch1 $ ls
dir1  dir2  dir3
me@localhost /srv/www/svnbugs/branches/branch1 $ svn st
?   dir3
me@localhost /srv/www/svnbugs/branches/branch1 $ svn add dir3
A dir3
me@localhost /srv/www/svnbugs/branches/branch1 $ svn commit -m "" dir3
Adding dir3

Committed revision 7.
me@localhost /srv/www/svnbugs/branches/branch1 $ cd ..
me@localhost /srv/www/svnbugs/branches $ cd ../trunk/
me@localhost /srv/www/svnbugs/trunk $ svn merge
svn+ssh://example.com/var/svn/svnbugs/branches/branch1
--- Merging r4 through r7 into '.':
   C dir2
Adir3
Summary of conflicts:
  Tree conflicts: 1
me@localhost /srv/www/svnbugs/trunk $ svn st
 M  .
  C dir2
  >   local add, incoming add upon merge
A  +dir3



The same thing happens upon file operations as well on ubuntu, osx, gentoo.


server


# uname -a
Linux example.com 2.6.32-5-amd64 #1 SMP Sat Oct 30 14:18:21 UTC 2010
x86_64 GNU/Linux
# svn --version
svn, version 1.6.16 (r1073529)
   compiled May  1 2011, 01:56:39
# aptitude show subversion
Package: subversion
State: installed
Automatically installed: no
Version: 1.6.16dfsg-1+b1
Priority: optional
Section: vcs
Maintainer: Peter Samuelson 
Uncompressed Size: 4,399 k
Depends: libsvn1 (= 1.6.16dfsg-1+b1), libapr1 (>= 1.2.7), libc6 (>=
2.3), libsasl2-2
Suggests: subversion-tools, db4.8-util, patch


client


# uname -a
Linux localhost 2.6.36-gentoo-r5 #1 SMP Fri Feb 18 15:24:49 EET 2011
x86_64 AMD Phenom(tm) II X4 965 Processor AuthenticAMD GNU/Linux
# svn --version
svn, version 1.6.16 (r1073529)
   compiled May 13 2011, 13:25:25
# emerge --info dev-vcs/subversion
Portage 2.1.9.42 (default/linux/amd64/10.0/desktop/kde, gcc-4.4.5,
libc-0-r0, 2.6.36-gentoo-r5 x86_64)
=
System Settings
=
System uname: 
Linux-2.6.36-gentoo-r5-x86_64-AMD_Phenom-tm-_II_X4_965_Processor-with-gentoo-2.0.2
Timestamp of tree: Fri, 13 May 2011 09:45:01 +
app-shells/bash: 4.1_p9
dev-java/java-config: 2.1.11-r3
dev-lang/python: 2.7.1-r1, 3.1.3-r1
dev-util/cmake:  

Re: Help with constant conflicts

[K.L.]

On Fri, May 13, 2011 at 4:35 PM, Stephen Butler  wrote:
>
> On May 13, 2011, at 13:41 , K.L. wrote:
>
>> Hi,
>>
>> Having problems with merge.
>
> [...]
>
>> me@localhost /srv/www/svnbugs/branches/branch1 $ svn merge
>> svn+ssh://example.com/var/svn/svnbugs/trunk
>> --- Merging r4 through r5 into '.':
>> A    dir2
>
> [...]
>
>> me@localhost /srv/www/svnbugs/trunk $ svn merge
>> svn+ssh://example.com/var/svn/svnbugs/branches/branch1
>> --- Merging r4 through r7 into '.':
>>   C dir2
>> A    dir3
>> Summary of conflicts:
>>  Tree conflicts: 1
>> me@localhost /srv/www/svnbugs/trunk $ svn st
>> M      .
>>      C dir2
>>>  local add, incoming add upon merge
>> A  +    dir3
>
> [...]
>
>> Is it a bug or we issue wrong commands?
>>
>
> The second merge was wrong.  To merge branch1 changes back to
> the trunk, use 'merge --reintegrate ^/branches/branch1'.
>
> See the section "Reintegrating a branch" in the SVN Book:
>
>  http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.reintegrate
Thanks. We used reintegrate option occasionally without knowing its
true purpose and assuming it's default when merging into trunk.
I've also read that svn 1.6 allows for multiple reintegrates. Can you
confirm it? Do multiple reintegrates completely equivalent to delete
and copy if so? And is it safe to recreate branch with the same name
as deleted?

Regards.
Kostia

Problems merging missed range

[K.L.]

Hi,

I tried to reintegrate branch, but svn said that some files in branch
miss range from trunk.
Tried to fix but range merge seems not working with urls.
So I backed up branch, deleted it, created with the same name and
overrode with backup. Committed branch, reintegrated, merged with
record-only and committed again.
Then tried to reintegrate one more time just for test. And those files
with missed ranges from old branch showed up in merge again though no
change were made to them along the way.
Any ideas what's happening?

Thanks