[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Unable to commit after merge

From: Axel Hallez <Axel.Hallez_at_telin.ugent.be>
Date: 2004-11-30 10:55:27 CET

Max,

Thanks for your reaction, here is the entries file:

<?xml version="1.0" encoding="utf-8"?>
<wc-entries
   xmlns="svn:">
<entry
   committed-rev="1"
   name=""
   committed-date="2004-09-07T09:25:59.737057Z"
   url="file:///C:/svnrepo/trunk/be/gymfed/competition/AGD"
   last-author="axel"
   kind="dir"
   uuid="7e625dac-ad06-254e-b567-b31cfa689812"
   revision="15"/>
<entry
   committed-rev="1"
   name="JuryPointsReportCategory.xml"
   text-time="2004-11-14T16:55:04.849204Z"
   committed-date="2004-09-07T09:25:59.737057Z"
   checksum="d03021a5b9a9dbc7c105b589c858cef1"
   last-author="axel"
   kind="file"
   prop-time="2004-11-14T16:55:04.839190Z"/>
<entry
   committed-rev="1"
   name="AllroundReport.jxml"
   text-time="2004-11-14T16:55:04.889262Z"
   committed-date="2004-09-07T09:25:59.737057Z"
   checksum="13822c593c3fe1006a0eb955712e8080"
   last-author="axel"
   kind="file"
   prop-time="2004-11-14T16:55:04.879248Z"/>
<entry
   committed-rev="1"
   name="AGDCompetition.java"
   text-time="2004-11-18T19:14:53.643096Z"
   committed-date="2004-09-07T09:25:59.737057Z"
   checksum="1fbe792712a8a46825129d6052a130da"
   last-author="axel"
   kind="file"
   prop-time="2004-11-18T19:14:53.633081Z"/>
<entry
   name="TeamDetailReportDetail.xml"
   text-time="2004-11-18T20:32:26.243206Z"
   checksum="7568b4dfa4cc25780bea2af4cf6873f7"
   copied="true"
   kind="file"
   copyfrom-rev="15"
   schedule="add"
   prop-time="2004-11-18T20:32:26.233192Z"
   revision="0"
   
copyfrom-url="file:///c:/svnrepo/branches/ICAGH/be/gymfed/competition/AGD/TeamDetailReportDetail.xml"/>
<entry
   committed-rev="1"
   name="AGDpanelVault2Avg.java"
   text-time="2004-11-14T16:55:04.999420Z"
   committed-date="2004-09-07T09:25:59.737057Z"
   checksum="473832fc1be03318e2c47621207396ba"
   last-author="axel"
   kind="file"
   prop-time="2004-11-14T16:55:04.999420Z"/>
<entry
   committed-rev="1"
   name="AGDpanelVault2.java"
   text-time="2004-11-18T19:14:53.723211Z"
   committed-date="2004-09-07T09:25:59.737057Z"
   checksum="c54c0424f8653caaed4c992c0a958290"
   last-author="axel"
   kind="file"
   prop-time="2004-11-18T19:14:53.713196Z"/>
<entry
   committed-rev="1"
   name="JuryPointsReport.jxml"
   text-time="2004-11-14T16:55:05.139622Z"
   committed-date="2004-09-07T09:25:59.737057Z"
   checksum="858499b8b9c2901dff28a7987b1f49d0"
   last-author="axel"
   kind="file"
   prop-time="2004-11-14T16:55:05.129608Z"/>
<entry
   committed-rev="1"
   name="AGDpanel.java"
   text-time="2004-11-18T19:14:54.284017Z"
   committed-date="2004-09-07T09:25:59.737057Z"
   checksum="b1a16f7927ce6241f9a71fbba0443ba5"
   last-author="axel"
   kind="file"
   prop-time="2004-11-18T19:14:54.284017Z"/>
<entry
   committed-rev="1"
   name=".nbattrs"
   text-time="2004-11-18T19:14:53.823355Z"
   committed-date="2004-09-07T09:25:59.737057Z"
   checksum="9cd522175200e918977cb9dbd1b0c5fa"
   last-author="axel"
   kind="file"
   prop-time="2004-11-18T19:14:53.813340Z"/>
<entry
   committed-rev="1"
   name="AllroundReportDetail.xml"
   text-time="2004-11-14T16:55:05.179680Z"
   committed-date="2004-09-07T09:25:59.737057Z"
   checksum="bc4268e05911780cc74ee2a75271adc5"
   last-author="axel"
   kind="file"
   prop-time="2004-11-14T16:55:05.169665Z"/>
<entry
   name="TeamShortReportCategory.xml"
   text-time="2004-11-18T20:32:26.333336Z"
   checksum="1b79bf162259b0a3e12ea9b04357c033"
   copied="true"
   kind="file"
   copyfrom-rev="15"
   schedule="add"
   prop-time="2004-11-18T20:32:26.323321Z"
   revision="0"
   
copyfrom-url="file:///c:/svnrepo/branches/ICAGH/be/gymfed/competition/AGD/TeamShortReportCategory.xml"/>
<entry
   committed-rev="1"
   name="AGDpanelVault2Max.java"
   text-time="2004-11-14T16:55:05.379968Z"
   committed-date="2004-09-07T09:25:59.737057Z"
   checksum="b2864fdd91ecd14591e14a3911d5178d"
   last-author="axel"
   kind="file"
   prop-time="2004-11-14T16:55:05.369953Z"/>
<entry
   name="TeamDetailReportCategory.xml"
   text-time="2004-11-18T20:32:26.343350Z"
   checksum="72c5a43975eba73ae41fc7972ba0843e"
   copied="true"
   kind="file"
   copyfrom-rev="15"
   schedule="add"
   prop-time="2004-11-18T20:32:26.343350Z"
   revision="0"
   
copyfrom-url="file:///c:/svnrepo/branches/ICAGH/be/gymfed/competition/AGD/TeamDetailReportCategory.xml"/>
<entry
   committed-rev="1"
   name="JuryPointsReportDetail.xml"
   text-time="2004-11-14T16:55:05.930760Z"
   committed-date="2004-09-07T09:25:59.737057Z"
   checksum="18b95f1b4be9e2c5996fd6c8ad350de5"
   last-author="axel"
   kind="file"
   prop-time="2004-11-14T16:55:05.920745Z"/>
<entry
   committed-rev="1"
   name="AllroundReportVariables.xml"
   text-time="2004-11-14T16:55:05.450068Z"
   committed-date="2004-09-07T09:25:59.737057Z"
   checksum="39c746ef89d9effb18e66a22687faf25"
   last-author="axel"
   kind="file"
   prop-time="2004-11-14T16:55:05.440054Z"/>
<entry
   name="TeamShortReportTeam.xml"
   text-time="2004-11-18T20:32:26.363379Z"
   checksum="c1ea3d929b8c466e62928d125fbfdd57"
   copied="true"
   kind="file"
   copyfrom-rev="15"
   schedule="add"
   prop-time="2004-11-18T20:32:26.363379Z"
   revision="0"
   
copyfrom-url="file:///c:/svnrepo/branches/ICAGH/be/gymfed/competition/AGD/TeamShortReportTeam.xml"/>
<entry
   committed-rev="1"
   name="AllroundReportCategory.xml"
   text-time="2004-11-14T16:55:06.030904Z"
   committed-date="2004-09-07T09:25:59.737057Z"
   checksum="f537e4ff80d014b33ffa4e49bb87e52d"
   last-author="axel"
   kind="file"
   prop-time="2004-11-14T16:55:06.020889Z"/>
<entry
   name="TeamDetailReportTeam.xml"
   text-time="2004-11-18T20:32:26.383408Z"
   checksum="373c1920e94698e920fecac82629f140"
   copied="true"
   kind="file"
   copyfrom-rev="15"
   schedule="add"
   prop-time="2004-11-18T20:32:26.373393Z"
   revision="0"
   
copyfrom-url="file:///c:/svnrepo/branches/ICAGH/be/gymfed/competition/AGD/TeamDetailReportTeam.xml"/>
<entry
   name="TeamShortReport.jxml"
   text-time="2004-11-18T20:32:26.403436Z"
   checksum="3dcb097a78db3fe5328970ef7b9670a8"
   copied="true"
   kind="file"
   copyfrom-rev="15"
   schedule="add"
   prop-time="2004-11-18T20:32:26.393422Z"
   revision="0"
   
copyfrom-url="file:///c:/svnrepo/branches/ICAGH/be/gymfed/competition/AGD/TeamShortReport.jxml"/>
<entry
   name="TeamDetailReport.jxml"
   text-time="2004-11-18T20:32:26.423465Z"
   checksum="a7a7e298bc2391d75d7a3a754184a41c"
   copied="true"
   kind="file"
   copyfrom-rev="15"
   schedule="add"
   prop-time="2004-11-18T20:32:26.413451Z"
   revision="0"
   
copyfrom-url="file:///c:/svnrepo/branches/ICAGH/be/gymfed/competition/AGD/TeamDetailReport.jxml"/>
</wc-entries>

The files with schedule="add" are giving me troubles.

Axel Hallez

Max Bowsher wrote:

> Axel Hallez wrote:
>
>> Hello all,
>>
>> My problem is as follows:
>> I merged the changes of a branch back to my working copy (taken from
>> trunk).
>> In the branch there where some files added, which was correctly detected
>> in the merge operation, so they where added to my working copy too.
>> However when I wanted to commit the changes in my working copy to trunk
>> I got an error, saying that the added files could be committed since
>> they belonged to a different repository!
>>
>> Did I do something wrong? Is there a solution?
>
>
> To help us understand the problem, please show us the contents of the
> .svn/entries file for a directory which contains one of the problem
> added files.
>
> Max.
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 30 11:03:21 2004

This is an archived mail posted to the Subversion Users mailing list.