Databases
StackOverflow2013
Postsdbo
POTree conflict on new unmodified branches
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POTree conflict on new unmodified branches
    primarykey
    data
    text
    <p>I've found myself with a problem I connot seem to solve at this moment. </p> <p>I created a new repository with in the trunk the leading copy of my project. Then i create a branch from the working copy and do a fresh checkout of the branch in a new local working copy. (EDITED)</p> <p>While not having made a change in the trunk or the branch I get tree conflicts in all the main folders in the project while merging trunk:head rivision to the branch. </p> <p>So advice would be welcome regarding this, I was thinking of removing the repository completely and create a new one to see if this "error" persists. however a cleaner solution would be welcome. </p> <p>BTW even after solving the conflict with keeping local or keeping from repository will result in the same conflicts if i do another merge. </p> <p>Folder structure is basic: </p> <ul> <li>/repos/project/trunk</li> <li>/repos/project/tags</li> <li>/repos/project/branches/project_branch1</li> <li>/repos/project/branches/project_branch2</li> </ul> <p>When doing the merge. both trunk and branch are at the same repository version. </p> <p>Step by Step : </p> <ol> <li>I create the project svn with svnadmin create project</li> <li>Create 3 folders one by one (revision is 3)</li> <li>i do a checkout of the trunk. </li> <li>Add all project files in the folder add/commit</li> <li>Create a branch from trunk in branches folder branches/project_branch_1</li> <li>i do a checkout of the branch</li> <li>update both trunk and branch. their versions get updated to the latest (5)</li> <li>do a merge ifrom trunk:head to branch -> tree conflicts apear. </li> </ol>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USDonSeba
    1. USDonSeba
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POTree conflict on new unmodified branches
      1. This table or related slice is empty.
      1. VTUpMod
    1. COCould you describe your repository structure? (how you setup trunk, branch folders, if you did)
      singulars
      1. POTree conflict on new unmodified branches
      1. USdario_ramos
    2. CO/repos/project/trunk , /repos/project/branches/sub_project1, /repos/project/branches/sub_project2, /repos/project/tags
      singulars
      1. POTree conflict on new unmodified branches
      1. USDonSeba
    3. CODid you create the branch from the trunk url or from the trunk checkout? (If from the checkout: make sure you update before tagging)
      singulars
      1. POTree conflict on new unmodified branches
      1. USBert Huijben
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload