How to Assure Jean Never Talks to You: Hg, Kiln, and Source Tree

Lessons from using Mercurial

Transcript

1. HG, KILN, AND SOURCE TREE HOW TO ASSURE JEAN DOES NOT TALK TO YOU EVER
2. PAINFUL LESSONS WHAT I HAVE LEARNED SO FAR MISTAKES I HAVE MADE AT DASHLANE
3. HOW YOU CAN *POSSIBLY* RUN INTO SO MANY BUILD PROBLEMS?! Tancho IF I CAN SAVE YOU FROM THIS, IT WAS ALL WORTH IT.
4. I DON’T KNOW HOW YOU MANAGED TO DO THAT… Thomas, on multiple heads
5. EVERYONE KNOWS YOU DON’T PUSH THE BUTTONS! Dinesh, on Kiln AND IN CASE YOU DON’T KNOW
7. “SHIRLEY…”
8. “SHIRLEY, DID YOU MAKE A CHANGE TO ‘DEFAULT’?”
9. http://stan.dashlane.com/fogbugz/kiln/ Code/Repositories/Client/Dev
10. http://stan.dashlane.com/fogbugz/kiln/ Code/Repositories/Client/Dev
11. FILTER TO A SPECIFIC BRANCH
12. FILTER TO A SPECIFIC BRANCH
14. SOURCETREE DO IT AGAIN
18. BUT HOW DID THAT CHANGE?
23. I DON’T KNOW HOW YOU MANAGED TO DO THAT… Thomas, on multiple heads
24. hg incoming
26. hg fetch hg outgoing
30. $ hg push pushing to … searching for changes abort: push creates new remote head 0dd38f238d2f on branch 'android-dev'! (merge or see "hg help push" for details about pushing new heads)
31. $ hg summary parent: 96362:0dd38f238d2f example branch: android-dev commit: (clean) update: (current) $ hg id 0dd38f238d2f (android-dev)
32. $ hg heads | grep android-dev branch: android-dev branch: android-dev-and-3814-api-access branch: android-dev-AND-3828 …
33. $ hg heads . changeset: 96382:e71b40142be6 branch: android-dev tag: tip parent: 96361:3651d463232c user: Build Manager <buildmanager@dashlane.com> date: Mon Nov 23 22:09:49 2015 +0100 summary: Android Build from buildmanager v967 changeset: 96362:0dd38f238d2f branch: android-dev user: sgaw
35. http://stan.dashlane.com/fogbugz/kiln/Code/Repositories/ Client/Dev/File/CppLibrairies/SourceCode/KWMobile/Android/ Dashlane-Project/scripts/setup_environment/readme/ FINAL_README?rev=android-dev NAVIGATE TO A SPECIFIC FILE http://stan.dashlane.com/fogbugz/kiln/ Code/Repositories/Client/Dev/File/ <path>?rev=android-dev
37. EVERYONE KNOWS YOU DON’T PUSH THE BUTTONS IN KILN! Dinesh, on Kiln AND IN CASE YOU DON’T KNOW
39. DEFAULT REVISION IN KILN http://stan.dashlane.com/fogbugz/kiln/ Code/Repositories/Client/Dev/File/ <path>?rev=tip
40. DEFAULT MAC-DESKTOP TIP WHAT HAPPENS ON KILN UI SAVE
41. DEFAULT MAC-DESKTOP TIP WHAT HAPPENS ON KILN UI SAVE
42. DEFAULT MAC-DESKTOP TIP WHAT HAPPENS ON KILN UI SAVE
44. DEFAULT MAC-DESKTOP FIX? NEW HEAD OLD HEAD $ hg commit —close-branch -r <old head>
45. THE END