|
»
»
»
SVN Update
|
View:
New views
6 Messages
—
Rating Filter:
Alert me
|
 |
SVN Update
by Bones
::
Rate this Message:
Hi,
Using SVNkit 1.2.0-beta2. How can I do the following: I want to use SVN to provide updates to xml stylesheets. Currently, I am the only one able to commit a change as apache asks for a password to do the commit. However, if the client changes the stylesheet file and they run an update with SVNkit, the file does not update to the current revision. It just remains in conflict. I am using SVN to prevent the client from changing the stylesheet, meaning if they make a change, it will be overwritten on the next update. How do I make sure that when they run update, they download the latest file? Thanks, Phil --------------------------------------------------------------------- To unsubscribe, e-mail: svnkit-users-unsubscribe@... For additional commands, e-mail: svnkit-users-help@... |
|
|
RE: SVN Update
by Bones
::
Rate this Message:
Hi,
Can anyone provide some feed back on this? Thanks, Phil -----Original Message----- From: Vallone, Philip Mr CTR USA AMC [mailto:Philip.Vallone@...] Sent: Wednesday, July 23, 2008 1:55 PM To: svnkit-users@... Subject: SVN Update Hi, Using SVNkit 1.2.0-beta2. How can I do the following: I want to use SVN to provide updates to xml stylesheets. Currently, I am the only one able to commit a change as apache asks for a password to do the commit. However, if the client changes the stylesheet file and they run an update with SVNkit, the file does not update to the current revision. It just remains in conflict. I am using SVN to prevent the client from changing the stylesheet, meaning if they make a change, it will be overwritten on the next update. How do I make sure that when they run update, they download the latest file? Thanks, Phil --------------------------------------------------------------------- To unsubscribe, e-mail: svnkit-users-unsubscribe@... For additional commands, e-mail: svnkit-users-help@... --------------------------------------------------------------------- To unsubscribe, e-mail: svnkit-users-unsubscribe@... For additional commands, e-mail: svnkit-users-help@... |
|
|
Re: SVN Update
by Alexander Kitaev-3
::
Rate this Message:
Hello Philip,
So, you'd like to make update always overwrite local changes? This is not default Subversion behaviour - by default it attempts to merge incoming changes with local ones and reports conflict in case merging is not possible. You may override default behaviour by providing your custom ISVNMergerFactory in ISVNOptions (you may extend DefaultSVNOptions class and ovverride getMergerFactory method). In you ISVNMergerFactory implementation you have to return ISVNMerger instance. I'd recommend to return instance of DefaultSVNMerger with ISVNConflictHandler set on it. And in that ISVNConflictHandler you have to return new SVNConflictResult(SVNConflictChoice.THEIRS_FULL, null) in order to achieve desired behaviour. It all may sound a little bit complicated. Another, easier approach is to perform export instead of update and delete existing files before exporting latest version from repository. This way you'll make sure user always have the latest version of files as they are in repository. Alexander Kitaev, TMate Software, http://svnkit.com/ - Java [Sub]Versioning Library! Vallone, Philip Mr CTR USA AMC wrote: > Hi, > > Using SVNkit 1.2.0-beta2. How can I do the following: > > I want to use SVN to provide updates to xml stylesheets. Currently, I am > the only one able to commit a change as apache asks for a password to do > the commit. However, if the client changes the stylesheet file and they > run an update with SVNkit, the file does not update to the current > revision. It just remains in conflict. I am using SVN to prevent the > client from changing the stylesheet, meaning if they make a change, it > will be overwritten on the next update. How do I make sure that when > they run update, they download the latest file? > > Thanks, > > Phil > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: svnkit-users-unsubscribe@... > For additional commands, e-mail: svnkit-users-help@... > > --------------------------------------------------------------------- To unsubscribe, e-mail: svnkit-users-unsubscribe@... For additional commands, e-mail: svnkit-users-help@... |
|
|
RE: SVN Update
by Bones
::
Rate this Message:
Thanks,
Yes a little complicated. So basicly, I need to do a merge and then ignore the clients changes? -----Original Message----- From: Alexander Kitaev [mailto:Alexander.Kitaev@...] Sent: Thursday, July 24, 2008 11:05 AM To: svnkit-users@... Subject: Re: SVN Update Hello Philip, So, you'd like to make update always overwrite local changes? This is not default Subversion behaviour - by default it attempts to merge incoming changes with local ones and reports conflict in case merging is not possible. You may override default behaviour by providing your custom ISVNMergerFactory in ISVNOptions (you may extend DefaultSVNOptions class and ovverride getMergerFactory method). In you ISVNMergerFactory implementation you have to return ISVNMerger instance. I'd recommend to return instance of DefaultSVNMerger with ISVNConflictHandler set on it. And in that ISVNConflictHandler you have to return new SVNConflictResult(SVNConflictChoice.THEIRS_FULL, null) in order to achieve desired behaviour. It all may sound a little bit complicated. Another, easier approach is to perform export instead of update and delete existing files before exporting latest version from repository. This way you'll make sure user always have the latest version of files as they are in repository. Alexander Kitaev, TMate Software, http://svnkit.com/ - Java [Sub]Versioning Library! Vallone, Philip Mr CTR USA AMC wrote: > Hi, > > Using SVNkit 1.2.0-beta2. How can I do the following: > > I want to use SVN to provide updates to xml stylesheets. Currently, I > am the only one able to commit a change as apache asks for a password > to do the commit. However, if the client changes the stylesheet file > and they run an update with SVNkit, the file does not update to the > current revision. It just remains in conflict. I am using SVN to > prevent the client from changing the stylesheet, meaning if they make > a change, it will be overwritten on the next update. How do I make > sure that when they run update, they download the latest file? > > Thanks, > > Phil > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: svnkit-users-unsubscribe@... > For additional commands, e-mail: svnkit-users-help@... > > --------------------------------------------------------------------- To unsubscribe, e-mail: svnkit-users-unsubscribe@... For additional commands, e-mail: svnkit-users-help@... --------------------------------------------------------------------- To unsubscribe, e-mail: svnkit-users-unsubscribe@... For additional commands, e-mail: svnkit-users-help@... |
|
|
Re: SVN Update
by Alexander Kitaev-2
::
Rate this Message:
Hello,
> Yes a little complicated. So basicly, I need to do a merge and then > ignore the clients changes? Yes, you have to provide implementation of ISVNMerger that will do no merge but will always replace local version with one from repository. Alexander Kitaev, TMate Software, http://svnkit.com/ - Java [Sub]Versioning Library! Vallone, Philip Mr CTR USA AMC wrote: > Thanks, > > Yes a little complicated. So basicly, I need to do a merge and then > ignore the clients changes? > > > > > -----Original Message----- > From: Alexander Kitaev [mailto:Alexander.Kitaev@...] > Sent: Thursday, July 24, 2008 11:05 AM > To: svnkit-users@... > Subject: Re: SVN Update > > Hello Philip, > > So, you'd like to make update always overwrite local changes? This is > not default Subversion behaviour - by default it attempts to merge > incoming changes with local ones and reports conflict in case merging is > not possible. > > You may override default behaviour by providing your custom > ISVNMergerFactory in ISVNOptions (you may extend DefaultSVNOptions class > and ovverride getMergerFactory method). > > In you ISVNMergerFactory implementation you have to return ISVNMerger > instance. I'd recommend to return instance of DefaultSVNMerger with > ISVNConflictHandler set on it. And in that ISVNConflictHandler you have > to return new SVNConflictResult(SVNConflictChoice.THEIRS_FULL, null) in > order to achieve desired behaviour. > > It all may sound a little bit complicated. Another, easier approach is > to perform export instead of update and delete existing files before > exporting latest version from repository. This way you'll make sure user > always have the latest version of files as they are in repository. > > Alexander Kitaev, > TMate Software, > http://svnkit.com/ - Java [Sub]Versioning Library! > > Vallone, Philip Mr CTR USA AMC wrote: >> Hi, >> >> Using SVNkit 1.2.0-beta2. How can I do the following: >> >> I want to use SVN to provide updates to xml stylesheets. Currently, I >> am the only one able to commit a change as apache asks for a password >> to do the commit. However, if the client changes the stylesheet file >> and they run an update with SVNkit, the file does not update to the >> current revision. It just remains in conflict. I am using SVN to >> prevent the client from changing the stylesheet, meaning if they make >> a change, it will be overwritten on the next update. How do I make >> sure that when they run update, they download the latest file? >> >> Thanks, >> >> Phil >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: svnkit-users-unsubscribe@... >> For additional commands, e-mail: svnkit-users-help@... >> >> > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: svnkit-users-unsubscribe@... > For additional commands, e-mail: svnkit-users-help@... > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: svnkit-users-unsubscribe@... > For additional commands, e-mail: svnkit-users-help@... > --------------------------------------------------------------------- To unsubscribe, e-mail: svnkit-users-unsubscribe@... For additional commands, e-mail: svnkit-users-help@... |
|
|
RE: SVN Update
by Bones
::
Rate this Message:
Thanks,
Phil -----Original Message----- From: Alexander Kitaev [mailto:kitaev@...] Sent: Thursday, July 24, 2008 12:30 PM To: svnkit-users@... Subject: Re: SVN Update Hello, > Yes a little complicated. So basicly, I need to do a merge and then > ignore the clients changes? Yes, you have to provide implementation of ISVNMerger that will do no merge but will always replace local version with one from repository. Alexander Kitaev, TMate Software, http://svnkit.com/ - Java [Sub]Versioning Library! Vallone, Philip Mr CTR USA AMC wrote: > Thanks, > > Yes a little complicated. So basicly, I need to do a merge and then > ignore the clients changes? > > > > > -----Original Message----- > From: Alexander Kitaev [mailto:Alexander.Kitaev@...] > Sent: Thursday, July 24, 2008 11:05 AM > To: svnkit-users@... > Subject: Re: SVN Update > > Hello Philip, > > So, you'd like to make update always overwrite local changes? This is > not default Subversion behaviour - by default it attempts to merge > incoming changes with local ones and reports conflict in case merging > is not possible. > > You may override default behaviour by providing your custom > ISVNMergerFactory in ISVNOptions (you may extend DefaultSVNOptions > class and ovverride getMergerFactory method). > > In you ISVNMergerFactory implementation you have to return ISVNMerger > instance. I'd recommend to return instance of DefaultSVNMerger with > ISVNConflictHandler set on it. And in that ISVNConflictHandler you > have to return new SVNConflictResult(SVNConflictChoice.THEIRS_FULL, > null) in order to achieve desired behaviour. > > It all may sound a little bit complicated. Another, easier approach is > to perform export instead of update and delete existing files before > exporting latest version from repository. This way you'll make sure > user always have the latest version of files as they are in repository. > > Alexander Kitaev, > TMate Software, > http://svnkit.com/ - Java [Sub]Versioning Library! > > Vallone, Philip Mr CTR USA AMC wrote: >> Hi, >> >> Using SVNkit 1.2.0-beta2. How can I do the following: >> >> I want to use SVN to provide updates to xml stylesheets. Currently, I >> am the only one able to commit a change as apache asks for a password >> to do the commit. However, if the client changes the stylesheet file >> and they run an update with SVNkit, the file does not update to the >> current revision. It just remains in conflict. I am using SVN to >> prevent the client from changing the stylesheet, meaning if they make >> a change, it will be overwritten on the next update. How do I make >> sure that when they run update, they download the latest file? >> >> Thanks, >> >> Phil >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: svnkit-users-unsubscribe@... >> For additional commands, e-mail: svnkit-users-help@... >> >> > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: svnkit-users-unsubscribe@... > For additional commands, e-mail: svnkit-users-help@... > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: svnkit-users-unsubscribe@... > For additional commands, e-mail: svnkit-users-help@... > --------------------------------------------------------------------- To unsubscribe, e-mail: svnkit-users-unsubscribe@... For additional commands, e-mail: svnkit-users-help@... --------------------------------------------------------------------- To unsubscribe, e-mail: svnkit-users-unsubscribe@... For additional commands, e-mail: svnkit-users-help@... |
| Free Forum Powered by Nabble | Forum Help |