Re: Merging a branch back to trunk produces more changes than previewed (commit would perform a LOT of changes)

From: Stein Somers <ssomers_at_opnet.com>
Date: Wed, 23 Sep 2009 16:37:32 +0200

Stefan M. Huber wrote:
> After updating both branch and trunk to the most current revision

Both? There's no point in updating or even having a working copy for the
branch. When you merge into the trunk working copy, the branch data comes
directly from the repository.

> Any idea what could go wrong here?

Output of "svn stat" would greatly help here.

-- 
Stein
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2398907
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].

Received on 2009-09-23 16:38:38 CEST

This message: [ Message body ]
Next message: David Weintraub: "Re: I'm looking for Web-Based SVN Client"
Previous message: Paul Hammant: "Re: Getting merge to ignore a directory in source and destination branch for a merge (tree conflict)"
In reply to: Stefan M. Huber: "Merging a branch back to trunk produces more changes than previewed (commit would perform a LOT of changes)"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]