You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by paptimusx <pa...@gmail.com> on 2008/07/18 02:28:18 UTC
I'd like to merge again.
Hi! there.
with Ver1.5, I had merged trunk with the branch.
and I did revert.
How should I do to do the merging over again?
It was not good in '-- force' option.
thankx in advance.
% svn --version | head -3
svn, version 1.5.0 (r31699)
compiled Jun 21 2008, 07:29:17
% ver
Microsoft Windows XP [Version 5.1.2600]
on branch (branch off revision 9725)
% svn merge -r9725:HEAD http://server/svn/PROJECT/SRC/trunk/S/ .
G Makefile
% revert Makefile
retry
% svn merge -r9725:HEAD http://server/svn/PROJECT/SRC/trunk/S/ .
can't.
% svn merge -r9725:HEAD http://server/svn/PROJECT/SRC/trunk/S/ . --force
can't.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: I'd like to merge again.
Posted by paptimusx <pa...@gmail.com>.
thank you. I hears it without trying. I'm sorry.
if we cancel by 'svn revert (-R) .'
does 'merging track history' disappear all in each merge history?
Is it only the latest transaction?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: I'd like to merge again.
Posted by Mark K <ma...@mitsein.net>.
Just doing svn revert -R . would have you covered as well.
On Fri, 18 Jul 2008 17:53:33 +0900
paptimusx <pa...@gmail.com> wrote:
> I understood well that the difference between 'svn revert .' and
> 'svn revert file'. I like a new merging function.
>
> Ryan, thank you very much.
>
> % svn revert .
> % svn merge -r9725:HEAD http://server/svn/PROJECT/SRC/trunk/S/ .
> --dry-run --- Merging r9726 through r9727 into '.':
> G Makefile
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
--
Mark K
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: I'd like to merge again.
Posted by paptimusx <pa...@gmail.com>.
I understood well that the difference between 'svn revert .' and
'svn revert file'. I like a new merging function.
Ryan, thank you very much.
% svn revert .
% svn merge -r9725:HEAD http://server/svn/PROJECT/SRC/trunk/S/ . --dry-run
--- Merging r9726 through r9727 into '.':
G Makefile
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: I'd like to merge again.
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Jul 17, 2008, at 21:28, paptimusx wrote:
> with Ver1.5, I had merged trunk with the branch.
> and I did revert.
> How should I do to do the merging over again?
> It was not good in '-- force' option.
>
> thankx in advance.
>
> % svn --version | head -3
> svn, version 1.5.0 (r31699)
> compiled Jun 21 2008, 07:29:17
> % ver
> Microsoft Windows XP [Version 5.1.2600]
>
> on branch (branch off revision 9725)
>
> % svn merge -r9725:HEAD http://server/svn/PROJECT/SRC/trunk/S/ .
> G Makefile
>
> % revert Makefile
The merge not only changed the Makefile, but also changed properties
on the directory. You probably have to revert those as well.
% revert .
> retry
> % svn merge -r9725:HEAD http://server/svn/PROJECT/SRC/trunk/S/ .
>
> can't.
>
> % svn merge -r9725:HEAD http://server/svn/PROJECT/SRC/trunk/S/ . --
> force
>
> can't.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org