# HG changeset patch
# User Chris Cannam
# Date 1331130236 0
# Node ID 2c106ea908b568b16570c9d7164dfbfec7cf93be
# Parent cc62862d21a4b7730957f275275a825719fdee1c
Add Help topic for remembering password; update CHANGELOG
diff -r cc62862d21a4 -r 2c106ea908b5 CHANGELOG
--- a/CHANGELOG Wed Mar 07 13:18:37 2012 +0000
+++ b/CHANGELOG Wed Mar 07 14:23:56 2012 +0000
@@ -1,3 +1,20 @@
+Changes in v1.2 since v1.1:
+
+ * Add a Find function to both My Work and History tabs
+ * Add a Cancel button to the progress bar in the status line when
+ carrying out network operations
+ * Remove Refresh button from the toolbar. This button was found to be
+ causing significant confusion, as some users interpreted it as
+ meaning resynchronise with the server, while in fact all it did was
+ re-read the local working copy. The function is still present, but
+ has been relegated to File -> Re-Read Working Folder
+ * Rework the filesystem watcher code, making it generally more
+ reliable (a requirement for removing the Refresh button)
+ * Fix problem with return codes in Mercurial 2.1 causing push and
+ pull to be reported as failing
+ * Make it possible to clear the remote repository URL
+ * Switch the Windows installer from InstallJammer to WiX
+
Changes in v1.1 since v1.0.1:
* Closed branches are now supported: you can close a branch in EasyMercurial
diff -r cc62862d21a4 -r 2c106ea908b5 easyhg.qrc
--- a/easyhg.qrc Wed Mar 07 13:18:37 2012 +0000
+++ b/easyhg.qrc Wed Mar 07 14:23:56 2012 +0000
@@ -44,6 +44,7 @@
If you are working with other people on a project, it is likely that -at some point you'll find that more than one of you have edited the -same lines in the same file, in different ways.
+When you push to a remote repository with an “https:" prefix on its +URL, EasyMercurial's password dialog should ask whether you want to +remember your login details.
-When that happens and you try to merge the two versions, EasyMercurial -will pop up a merge window that looks a bit like this.
+If you say yes, the details will be stored until EasyMercurial +exits—so you won't have to enter them if you push or pull again +while the present EasyMercurial session is running. Your password will +be stored, encrypted with a session key, in a file which is deleted +when EasyMercurial exits.
-If this option does not appear
-(This is actually a separate program, not part of EasyMercurial: it's -a merge tool called kdiff3.)
+... and if you're using OS/X, then you need to install the PyCrypto +library before EasyMercurial will be able to store encrypted passwords +for you.
-This looks a bit complicated, but it is there to help you pick which -of the changes from each of the two “rival” versions of the file you -want to use in your merged version.
+Try running sudo easy_install pycrypto
in a terminal window.
The top middle one is your current version. That's - the one you had before you decided to merge the other version into - it.
+Not using an https repository?
-At top right is the version you're merging. That's the other - rival version – the one that the other person can see in their copy - of the repository.
+If your remote repository uses ssh or some other protocol, then +EasyMercurial won't be able to help. You might consider using ssh +public key authentication and an ssh agent—talk to the admin of your +remote repository for more details.
-At top left is the common ancestor. That's the version that both - of you had, before you started editing it in different ways.
- -At the bottom is the output.
- -Each conflict (a line which you have both changed in different ways) -is shown with Merge Conflict in the output at the bottom. To sort -out the conflicts and get the right output, you need to go through -them one by one, for each one pressing the A, B, or C button to say -whether for this line you want the top-left, top-middle, or top-right -version to “win”. (You can choose more than one, if you want both -versions of a line to appear.)
- -Then having resolved a conflict, press the three-arrows-down toolbar -button to go to the next one – and when you've done them all, save -and exit.
- -The most important thing to remember is that whatever appears in the -bottom pane is what you'll get as a result.
- -No matter how confusing the process, just remember that if it looks -correct in the bottom pane, it will be correct when you save and -exit. You can even edit the file directly in the bottom pane if you -aren't happy with the way the merge is going.
- - - - diff -r cc62862d21a4 -r 2c106ea908b5 help/a-35.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/help/a-35.html Wed Mar 07 14:23:56 2012 +0000 @@ -0,0 +1,57 @@ + + + +If you are working with other people on a project, it is likely that +at some point you'll find that more than one of you have edited the +same lines in the same file, in different ways.
+ +When that happens and you try to merge the two versions, EasyMercurial +will pop up a merge window that looks a bit like this.
+ +(This is actually a separate program, not part of EasyMercurial: it's +a merge tool called kdiff3.)
+ +This looks a bit complicated, but it is there to help you pick which +of the changes from each of the two “rival” versions of the file you +want to use in your merged version.
+ +The top middle one is your current version. That's + the one you had before you decided to merge the other version into + it.
+ +At top right is the version you're merging. That's the other + rival version – the one that the other person can see in their copy + of the repository.
+ +At top left is the common ancestor. That's the version that both + of you had, before you started editing it in different ways.
+ +At the bottom is the output.
+ +Each conflict (a line which you have both changed in different ways) +is shown with Merge Conflict in the output at the bottom. To sort +out the conflicts and get the right output, you need to go through +them one by one, for each one pressing the A, B, or C button to say +whether for this line you want the top-left, top-middle, or top-right +version to “win”. (You can choose more than one, if you want both +versions of a line to appear.)
+ +Then having resolved a conflict, press the three-arrows-down toolbar +button to go to the next one – and when you've done them all, save +and exit.
+ +The most important thing to remember is that whatever appears in the +bottom pane is what you'll get as a result.
+ +No matter how confusing the process, just remember that if it looks +correct in the bottom pane, it will be correct when you save and +exit. You can even edit the file directly in the bottom pane if you +aren't happy with the way the merge is going.
+ + + + diff -r cc62862d21a4 -r 2c106ea908b5 help/topics.html --- a/help/topics.html Wed Mar 07 13:18:37 2012 +0000 +++ b/help/topics.html Wed Mar 07 14:23:56 2012 +0000 @@ -20,6 +20,7 @@I want to let my colleagues pull changes directly from my local repository
I want to put my changes into a master repository shared with my colleagues
-How do I use the Merge window?
+Every time I push some changes, I have to type my password again
+How do I use the Merge window?