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

Re: Merger not Merging -- What I would like a merge process to do.

From: Brass Tilde <brasstilde_at_insightbb.com>
Date: 2005-01-24 15:23:31 CET

I hate replying to myself, but I meant to say "from the time the branch was
cut", not "from the time the branch merged".

> > > ii) If the file is in the branch:HEAD and WAS in the trunk at the time
> > > the
> > > branch but has since been deleted in the trunk:WC then add and mark as
> > > conflict.
> >
> > No. The fact that the trunk is missing the file is irrelevant. If the
> > file didn't change in the branch, then there's no change to apply.
>
> So, if the HEAD of the branch *needs* that file, i.e. none of the
> assumptions about it's presence are changed from the time the branch
> [was cut], then presumably the trunk *did* change with respect to this
> file, correct?
>
> Will the lack of those changes in the branch, and their presence in the
> trunk, cause a conflict in the trunk working copy, or will the branch
> "non-changes" simply be merged with the trunk in the WC?
>
> I realize that svn doesn't know anything about the relationship between
the
> file itself and the changes concerning the file in the code, nor do I
expect
> it to. I'm just wondering what to expect when this type of situation
> occurs.
>
> I hope I've outlined that clearly; if not, I will try again.
>
> Bear in mind that I've *never* used branching in a version control product
> before. PVCS doesn't do a very good job of explaining the subject (or I
> wasn't prepared to understand it), and we generally only have one
developer
> working on any given application at one time, so it wasn't that important,
> However, I've found that svn does a much better job of describing
branching,
> and I actually think I begin to comprehend. Enough to ask silly questions
> anyway.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 24 15:26:07 2005

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