Re: RE: Re: Add missing files to old revision

I am not very familiar with merging, but you should be able to do the
following (assuming rev. 70 was the branch creation and rev. 71 the commit
of the missing files):
Check out trunk
Start the merge dialog
Select the branch_at_rev70 as the 'from' source
Select the branch_at_rev71 as the 'to' source
Select trunk as the target (should be set already if you started the merge
dialog from the working copy of trunk.

If that does not work, you need assistance from someone more familiar with
merging.

(p.s. apologies for top posting, this gmail mobile client doesn't let me
remove the quoted text... :-( )

Op 11 okt 2010 13:13 schreef "zishan" <jashsoftpk_at_aim.com>:

Ok, I have created a branch of revision 56 and make a local working copy of
it and added missing files in that folder and committed it. Now I am trying
to merge it with the TRUNK using Merge Reintegrate, but its not adding my
missing files from Branch to the trunk. Whats wrong?

> Hi,
>
> On 10 October 2010 15:39, zishan <jashsoftpk_at_aim.com> wrote:
> > I have forgot to add so...
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2669846

To unsubscribe from this discussion, e-mail: [
users-unsubscribe_at_tortoisesvn.tigris.org].

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2670385

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-10-12 07:52:54 CEST