Databases
StackOverflow2013
Postsdbo
POmercurial workflows when collaborating with people who make errors
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POmercurial workflows when collaborating with people who make errors
    primarykey
    data
    text
    <p>I need to collaborate on a Mercurial repository (let's call it "foo") with some people who are novices at version control in general, Mercurial in particular.</p> <p>I am trying to come up with a workflow that will enable us to use Mercurial without a lot of extra effort on either their end (confusion) or my end (cleanup).</p> <p>My concern is that as novices I need to expect them to make errors, and I need to allow them to do so in a controlled way, otherwise they won't use the tool at all because they're too scared. But I don't want a bad change to pollute the repository unnecessarily.</p> <p>I do not expect them to be able to merge properly or to use the <code>mq</code> extension. This is not a matter of underestimating them, instead it is a realistic assessment given past experience with SVN and my own experience with Hg.</p> <p><strong>Which of the following approaches would make the most sense? Or if there's a better approach, what is it?</strong></p> <ol> <li><p>We have a repository <code>foo-submit</code>, read/writable by all, and a repository <code>foo-trunk</code>, readable by all but writable by admins. Users pull from <code>foo-trunk</code>, and push changes to <code>foo-submit</code>. Cleanup: If I find a good change, I let it through as is; if I find a bad change, I "bypass" it by merging with the previous version.</p></li> <li><p>We have a repository <code>foo-trunk</code> readable by all, writable by admins. Each user is responsible for maintaining their own clone which is read-accessible to the rest of the team. When someone wants to push a change, they let me know and I pull it from their repository, with proper cleanup as necessary (same as in #1)</p></li> <li><p>We have a repository <code>foo-dev</code>, read/writable by all, and a repository <code>foo-trunk</code>, readable by all but writable by admins. Users pull/push to foo-dev, and work in named branches if they need to do extensive development. I am responsible for performing merges and cleanup. The <code>foo-trunk</code> repository is merely for having a "clean" copy that has branches where the tip is always in a good state.</p></li> </ol>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USJason S
    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
    3. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POmercurial workflows when collaborating with people who make errors
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POmercurial workflows when collaborating with people who make errors
      1. This table or related slice is empty.
      1. VTUpMod
    1. COHow many devs are going to be working in these repos?
      singulars
      1. POmercurial workflows when collaborating with people who make errors
      1. USBZink
    2. COgood question. 4 or 5 tops; mostly just 2 or 3 (myself included).
      singulars
      1. POmercurial workflows when collaborating with people who make errors
      1. USJason S
 

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