Track daily changes like a peon in a suitcase store

Question

I am struggling with the perceived conflict between tracking all my changes, so I can find out where I violated the code yesterday, and the controlled (high waybill) code verification process, which keeps common sense.

I work in a very traditional ClearCase store. All checks require code verification, and I do not have enough authority to create private branches. To satisfy the primary desire for a version that controls all my daily work, I use mercurial from with in clearcase view this only sort works

I seek collective wisdom as to what is the best way to keep track of my daily changes, playing my best with clear deeds.

Answer 1

I am not familiar with ClearCase, so the scope of my answer will be only mercurial.

I consider your next problem: I track changes locally to keep my steps, even if the steps are incomplete / broken, and then I present the whole picture for viewing, but it often turns out that these are too large commits and are not easy to consider. Am I right?

To solve this specific problem, I am using Mercurial Queues . These queues allow you to basically edit local loose commits, reorder and stack multiple patches into one single, or split one commit into small readable fragments. Before learning more about this, here is my suggestion on how you use them:

• . , , , . , , , .
• , 4780 , .
• .
• : " ?". , . .
• , , ( : Mercurial Queues). fold . , n, n + 1 n + 2, n + 1 n, n + 1 - oneliner... " # 1212313, , ".
• / . , . : , , .

Answer 2

, .

ClearCase ( !, " - ), .
: . CI - Continuous Integration - " ", . .
, .

, ( ).

, .

Git ClearCase ( "git init" ClearCase, Git!).
, .
" git bundle" Git , .

---

?

: ClearCase , ( UCM) (-UCM). , .
, WinMerge.

Answer 3

? , , . - , , . . 4780 , , .
. - . , .
mercurial " " - ? ? . , , .

Answer 4

. , . , , .

? clearcase diff , .

Answer 5

tanascius Stephen. , mercurial , , ClearCase . , Mercurial ClearCase 4780 -.

Perforce. git , - , , .

.