[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

What's going on: svn hangs on merge postpone for win but not lin?

From: Peter Kahn <citizenkahn_at_gmail.com>
Date: Wed, 3 Jun 2009 16:08:40 -0400

What can I do to find out why my merge hangs when I choose postpone during a
conflict using the command line tool? This only happens on windows and not
on linux.

I have a workaround (use linux), but I don't have a cause or an
understanding of the problem. That means my workaround could magically stop
working in future and I wouldn't know what to do. I'm looking for clues as
to what's the underlying problem.

*What I'm attempting:*
Trying a reintegration merge like this (r101 is the revision from trunk used
to make the branch)

svn merge trunkURL101 branch1URL trunkWorkspace

*What Happens:
prompted for conflict on foo.java, when I select *p*ostpone the command
hangs until I kill it
if I choose *tc* the merge continues properly

no conflicts happen. Merge completes successfully.

*Nature of the Change to the file:*
file foo.java was modified by a merge from branch2 to branch1 not involving
trunk. Both branch and trunk versions have native eol-style and this
appears to be honored on both win and lin.

The merge is the first introduction of the change to trunk. The change adds
of a few methods to the class.

I'd expect windows to be confused by newlines and by rename where the only
difference is case, but neither happened here.

  svn 1.5.4 linux httpd using FSFS
  svn 1.5.4 linux client
  svn 1.6.2 win client

*r102 create branch1 from trunk_at_r101
r103 create branch2 from trunk_at_r102
r104 modify foo.java on branch2
r105 modify foo.java on branch1 after merging from branch2

*Why am I seeing a conflict on win, but not linux?
     I'm guessing this must be a newline situation. Native eol-style on
branch and trunk version of file prior to merge

Why does postpone hang and what I do to find out what is going on?

thanks for any suggestions you can offer.

Peter Kahn
Awareness - Intention - Action
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-06-03 22:09:39 CEST

This is an archived mail posted to the Subversion Users mailing list.