Databases
StackOverflow2013
Postsdbo
POMerging a renamed folder from a SVN branch back into the trunk, keeping original named folder in trunk
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POMerging a renamed folder from a SVN branch back into the trunk, keeping original named folder in trunk
    primarykey
    data
    text
    <p>A little background, because this might be kind of confusing: the project I'm working on is one where most of the code is the same, but there are some files that change based on the platform we're deploying to. For this, the root folder has all of the "core" files that don't change, and then there is a directory for each platform with the files that change. So there's a <code>baz/foo.c</code> and a <code>bar/foo.c</code>, because <code>foo.c</code> changes depending on whether it's deployed to <code>baz</code> or <code>bar</code>. Makefiles and such make all this magic work.</p> <p>The quesiton is, I'm working on a new platform (we'll say <code>qux</code>) that is based on <code>bar</code>, so I've been working in a branch, and making modifications in the <code>bar</code> directory. Now I want to rename that directory to <code>qux</code>, but preserve the original <code>bar</code> in the trunk when it comes time to merge, because that platform still exists. So my ultimate goal is to, in the trunk after merge, have <code>baz</code> and <code>bar</code> as they were before my meddling, and a new folder <code>qux</code> with my changes (which are currently in the branch under the folder <code>bar</code>, and are based on the original <code>bar</code>).</p> <p>Is there an easy way to do this? If I rename <code>bar</code> to <code>qux</code> in my branch, it seems like it'll try to delete <code>bar</code> when I merge it back into trunk, which isn't what I want to happen. Do I need to do something like create a new folder <code>qux</code> in my branch, copy files into it from <code>bar</code>, and then revert <code>bar</code> back to its original state? Or is there a better way to do this?</p> <p><strong>Edit:</strong> To be clear, there are changes already in the <code>bar</code> folder that need to be reverted if I copy the files into a new folder.</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. UScincodenada
    1. UScincodenada
    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
    2. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. This table or related slice is empty.
 

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