I tried doing it like this :
clientManager.getDiffClient().doMerge(wcFile, SVNRevision.create(1), wcFile,
SVNRevision.HEAD,
wcFile, SVNDepth.INFINITY, true, true,
false, false);
to "revert" my WorkingCopy to version 1.
Why this abort with a Null Pointer Exception?
Snakebyte26 wrote:
>
> Thanks for your quick answer.
> But it doesnt help me a lot.
> Ok. I think i have to explain it a little bit more, because i think this
> is not really a reverse merge.
> Assume the following repository containing 5 versions.
> The User checks aus Version 2. Making some changes on some files in
> Version 2 (But not on all files).
> Now he want his Working Copy as new HEAD Revision. So he commits his
> changes.
>
> Normally SVN will give me 'out-of-date' errors on the modified files now.
>
> But all i want is the complete WorkingCopy as the new HEAD. Even the
> unchanged Files !
> So lets assume Version 2 consists of two files : FileA and FileB.
>
> FileA is modified and will throw an 'out-of-date' error. FileB is not
> changed.
> What i tried now is to do an update, autoresolve all conflicts to
> 'Mine-full' and commit. This works on FileA. But not on FileB. FileB is
> unchanged and due to the update (which i need - because i show me the
> conflicts) it is again in Version 5 ....but it should be in Version 2.
>
> I hope its better understandable now.
> Can somebody help me with this ? At all the Use-Case is pretty easy.
> Simply Commit Workspace everytime as new head, ignoring all out-of-dates,
> etc.
> But i dont know how to do this with SVNKIT.
>
> Greetings
>
>
>
>
> Dale Anson wrote:
>>
>> It sounds like you're asking about reverse merging. I haven't tried with
>> svnkit, but a merge is a merge, so it should work. See svn details here:
>>
>> http://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.html
>>
>> Dale
>>
>>
>> On Sat, Mar 17, 2012 at 10:34 AM, Snakebyte26 <[email protected]> wrote:
>>
>>>
>>> Ok this question is a little bit tricky to explain.
>>>
>>> Image the following :
>>> I have a repository with some versions. Lets assume 5-20 Versions. These
>>> Versions are stored in an FSFS Repository on local disk.
>>>
>>> What i now want is to make it possible, to commit older versions as new
>>> versions, which normally would give the 'out-of-date' error.
>>>
>>> Lets assume the following use-case. I have a user needing an older
>>> version
>>> with some changes as the newest version. So he checks out an older
>>> version,
>>> and want to commit these version as newest version, no matter any newer
>>> versions existing in the repository.
>>>
>>> How can i achieve this ? Is this even possible ?
>>>
>>> Greetings
>>> Snakebyte
>>>
>>> --
>>> View this message in context:
>>> http://old.nabble.com/Commit-the-whole-working-copy-everytime%2C-no-matter-on-versioning-information-tp33523158p33523158.html
>>> Sent from the SVNKit - Users mailing list archive at Nabble.com.
>>>
>>>
>>>
>>
>>
>
>
--
View this message in context:
http://old.nabble.com/Commit-the-whole-working-copy-everytime%2C-no-matter-on-versioning-information-tp33523158p33523754.html
Sent from the SVNKit - Users mailing list archive at Nabble.com.
