You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by KY...@bksv.com on 2009/08/05 07:39:20 UTC
How to svn merge without skipped targets?
Hi all,
I want to merge a folder from a different repository.
The merge source is like:
\Suites\xxxx
\Suites\yyyy
The merge destination is like:
\Suites\zzzz
I want to achieve this outcome:
\Suites\xxxx
\Suites\yyyy
\Suites\zzzz
The command line i use is:
c:\Builds\Source\Applications\ApplicationsTest>svn merge --dry-run
--accept mine-full -r 95976:HEAD http://svn/test <http://svn/test>
/trunk/Applications/ApplicationsTest@HEAD
<ma...@HEAD> .
( where HEAD revision is ~15000 )
( where revision 95976 is the initial creation of \Suites\xxxx and
\Suites\yyyy )
But i kept getting this kinda merge:
Skipped 'Suites\xxxx\aaaaa
Skipped 'Suites\xxxx\aaaaa\Log'
Skipped missing target: 'Suites\xxxx\aaaaa\qqqqq.cpp
How do make sure \Suites\xxxx is properly added to the merge destination
so i do not miss any file? Thanks.
svn server version: 1.5.5
svn client version: 1.5.6
Best Regards,
Lee
This e-mail is confidential and may be read, copied and used only by the intended recipient. If you have received it in error, please contact the sender immediately by return e-mail. Please then delete the e-mail and do not disclose its contents to any other person.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2380317
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: How to svn merge without skipped targets?
Posted by Tyler Roscoe <ty...@cryptio.net>.
On Mon, Aug 10, 2009 at 01:49:13PM +0200, KYLEE@bksv.com wrote:
> It works the same way when iam not in dry run.
> The results were identical.
What about the other thing I suggested?
> > The merge source is like:
> > \Suites\xxxx
> > \Suites\yyyy
> >
> > The merge destination is like:
> > \Suites\zzzz
> >
> > I want to achieve this outcome:
> > \Suites\xxxx
> > \Suites\yyyy
> > \Suites\zzzz
> >
> > The command line i use is:
> > c:\Builds\Source\Applications\ApplicationsTest>svn merge --dry-run
> > --accept mine-full -r 95976:HEAD http://svn/test <http://svn/test>
> > /trunk/Applications/ApplicationsTest@HEAD
> > <ma...@HEAD> .
> > ( where HEAD revision is ~15000 )
> > ( where revision 95976 is the initial creation of \Suites\xxxx and
> > \Suites\yyyy )
> >
> > But i kept getting this kinda merge:
> > Skipped 'Suites\xxxx\aaaaa
> > Skipped 'Suites\xxxx\aaaaa\Log'
> > Skipped missing target: 'Suites\xxxx\aaaaa\qqqqq.cpp
>
> Does it work if you go back one revision to 95975?
tyler
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2382096
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: How to svn merge without skipped targets?
Posted by KY...@bksv.com.
It works the same way when iam not in dry run.
The results were identical.
Best Regards,
Lee
-----Original Message-----
From: Tyler Roscoe [mailto:tyler@cryptio.net]
Sent: Wednesday, August 05, 2009 10:22 PM
To: Lee, Khang Yeen
Cc: users@subversion.tigris.org
Subject: Re: How to svn merge without skipped targets?
On Wed, Aug 05, 2009 at 09:39:20AM +0200, KYLEE@bksv.com wrote:
> I want to merge a folder from a different repository.
Careful with your terminology. You can't merge from a different
repository. It looks like you're trying to merge from one project
(top-level dir underneath a repo) to another.
> The merge source is like:
> \Suites\xxxx
> \Suites\yyyy
>
> The merge destination is like:
> \Suites\zzzz
>
> I want to achieve this outcome:
> \Suites\xxxx
> \Suites\yyyy
> \Suites\zzzz
>
> The command line i use is:
> c:\Builds\Source\Applications\ApplicationsTest>svn merge --dry-run
> --accept mine-full -r 95976:HEAD http://svn/test <http://svn/test>
> /trunk/Applications/ApplicationsTest@HEAD
> <ma...@HEAD> .
> ( where HEAD revision is ~15000 )
> ( where revision 95976 is the initial creation of \Suites\xxxx and
> \Suites\yyyy )
>
> But i kept getting this kinda merge:
> Skipped 'Suites\xxxx\aaaaa
> Skipped 'Suites\xxxx\aaaaa\Log'
> Skipped missing target: 'Suites\xxxx\aaaaa\qqqqq.cpp
Does it work if you go back one revision to 95975?
Does it work if you do the merge for real instead of with --dry-run?
tyler
This e-mail is confidential and may be read, copied and used only by the intended recipient. If you have received it in error, please contact the sender immediately by return e-mail. Please then delete the e-mail and do not disclose its contents to any other person.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2382036
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: How to svn merge without skipped targets?
Posted by Tyler Roscoe <ty...@cryptio.net>.
On Wed, Aug 05, 2009 at 09:39:20AM +0200, KYLEE@bksv.com wrote:
> I want to merge a folder from a different repository.
Careful with your terminology. You can't merge from a different
repository. It looks like you're trying to merge from one project
(top-level dir underneath a repo) to another.
> The merge source is like:
> \Suites\xxxx
> \Suites\yyyy
>
> The merge destination is like:
> \Suites\zzzz
>
> I want to achieve this outcome:
> \Suites\xxxx
> \Suites\yyyy
> \Suites\zzzz
>
> The command line i use is:
> c:\Builds\Source\Applications\ApplicationsTest>svn merge --dry-run
> --accept mine-full -r 95976:HEAD http://svn/test <http://svn/test>
> /trunk/Applications/ApplicationsTest@HEAD
> <ma...@HEAD> .
> ( where HEAD revision is ~15000 )
> ( where revision 95976 is the initial creation of \Suites\xxxx and
> \Suites\yyyy )
>
> But i kept getting this kinda merge:
> Skipped 'Suites\xxxx\aaaaa
> Skipped 'Suites\xxxx\aaaaa\Log'
> Skipped missing target: 'Suites\xxxx\aaaaa\qqqqq.cpp
Does it work if you go back one revision to 95975?
Does it work if you do the merge for real instead of with --dry-run?
tyler
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2380473
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].