You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Hello,
Is there an equivalent of the command-line automatic conflict resolution in the
update command for svnant? Or is this planned for a future release?
SVN example:
svn update --accept THEIRS
svn update --accept 'theirs-full'
svn up --accept tf
SVNANT:
<svn>
<update accept="tf" />
</svn>
We encounter problems when we generate translations:
when someone generates all translations en the scheduled generation of
translations takes place at the same time,
the update can not be handled automatically through svnant with delete and svn
update.
Only by hand one can solve it through the use of svn update with tf; this takes
up too much time.
If there is a conflict we want the conflict to be resolved so the translations
can be overwritten.
(See also http://www.logicaltrinkets.com/wordpress/?p=178 for a svn tutorial on
resolving conflicts with svn)
With kind regards,
Johan de Zwaan
Metadata Imported from Tigris (Issue 1283)
Creation Date: 2011-07-12 05:54:27
Reporter: jdzinv
Subcomponent: svnant
Version: unspecified
Milestone: not determined
Keywords:
Cc:
Comments
2011-07-14 11:09:54 by costamojan
There is no planning on this topic yet. Nevertheless I consider this a useful
option and will have a look at it ASAP (please be aware that I need to verify
that all other used clients support this).
Bye
Daniel Kasmeroglu
2011-07-27 14:44:32 by costamojan
Assigned to myself.
2011-09-29 14:24:51 by costamojan
With revision #5148 of the repository an initial implementation of the conflict
resolution has been realized. Due to my lack of time there were no tests about
the functionality. The resolution needs to be set for the 'svnSetting' element.
As there's neither a testcase yet, nor some knowledge about it's functionality
the distribution is provided AS IS until I manage to complete the implementation
properly.
A current build can be found at the following location:
http://www.kasisoft.com/hudson/job/svnant/
Feel free to add any comments about bugs to this issue.
Best regards
Daniel Kasmeroglu
The text was updated successfully, but these errors were encountered:
Description
Metadata Imported from Tigris (Issue 1283)
Comments
2011-07-14 11:09:54 by costamojan
2011-07-27 14:44:32 by costamojan
2011-09-29 14:24:51 by costamojan
The text was updated successfully, but these errors were encountered: