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

Re: How do others fare with merging?

From: Quest <quest_at_lysator.liu.se>
Date: 2005-07-11 13:35:38 CEST

On Mon, 11 Jul 2005 00:16:42 -0400, "Labanca, Rick" <rick.labanca@studentuniverse.com> writes:

> We have been using svn for a while now, but there is one hump our devs
> all hit including me. Merging.
>
> Whether merging from trunk to a branch, or vice-versa there are issues
> that pop up, and I've found them hard to pin down. Often a merge will
> indicate conflicts with files not touched at all in the branch, or not
> merge what has.
>
> I am certain in my personal cases that I've gotten the correct revision
> numbers right, and have moved them around. It just seems to get confused
> anyway. Most of us have used cvs and other systems for years, I don't
> really think it's operator error unless we all are really goofed up in
> the same way.
>
> Also when this happens I tend to think of clients, but oddly enough
> using tortoise, subclipse or command line has done the same thing.
>
> This isn't to diagnose, I know it's too vague, I just am wondering if
> anyone else has this kind of general issue. We've been through a few
> revs and it's been about the same.

Yes, I've had similar issues. For example, we had a merge trunk ->
branch where one person typing and two persons checking and thinking.
We were sure we had done everything correctly, but still svn was
convinced that files in the trunk that wasn't modified after branch
was different from files on the branch (one hypothesis was that libsvn
was convinced they were different files). After repairing this, people
that did svn switch from trunk to branch got "?" on folders that had
been around for ages.

svn version was 1.2.0, method http and backend bdb.

--
Anders "Quest" Qvist
Ye olde jungle proverb:
Even the Phantom must turn on the light to see what's in his goth wardrobe.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jul 11 13:39:33 2005

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