Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    singulars
    1. This table or related slice is empty.
    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. CONote I have a hard time believing that it is, in fact, impossible. Subversion used to have similar issues with merges. If you didn't keep track of where your branch started and when merges occurred, you could not re-merge additional changes without tremendous conflicts. I think this is the same for Accurev. But as best as I can tell, no one knows how to do it correctly. So in effect, "you can't" is the best possible answer.
      singulars
    2. COAccuRev `diff` does not combine and display "on the fly" patches that you pick and choose; it `diff`s (the contents of) two versions. (If it did let you pick-and-choose and there were ambiguities, would you, the user, resolve them every time you `diff`ed, on the fly, too?) If you want to see _fix 1_ + _fix to fix 1_ (i.e. excluding _fix 2_), you have to generate and `keep` the _basis_ + _fix 1_ + _fix to fix 1_, then diff the end result against the _basis_...
      singulars
    3. COSo anyway, off the top of my head: right-click on your stream, select "Show Active Transactions", pick your transactions (e.g. _fix 1_ and _fix to fix 1_), right click and "Send to change Palette", send to an empty "for review" workspace (which hangs off your stream's parent, or off a child of your stream which was timebased just before _fix 1_), resolve any merge ambiguities, go to your "for review" workspace, NOW diff against backed, then discard (purge) the contents of the "for review" workspace.
      singulars
 

Querying!

 
Guidance

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