Bookmarks are tags that move forward automatically to subsequent changes, leaving no mark on the changesets that previously had that bookmark pointing toward them.  Named branches, on the other hand, are indelible marks that are part of a changeset.  Multiple heads can be on the same branch, but only one head at a time can be pointed to by the same bookmark.  Named branches are pushed/pulled from repo to repo, and bookmarks don&#39;t travel.

There&#39;s a great branching comparison here: http://stevelosh.com/blog/entry/2009/8/30/a-guide-to-branching-in-mercurial/

I have a problem using docstrings with decorators. Given the following example:

    def decorator(f):
        def _decorator():
            print &#39;decorator active&#39;
            f()
        return _decorator
    
    @decorator
    def foo():
        &#39;&#39;&#39;the magic foo function&#39;&#39;&#39;
        print &#39;this is function foo&#39;
    
    help(foo)

Now the help doesn&#39;t show me the docstring of `foo` as expected, it shows:

    Help on function _decorator in module __main__:
    
    _decorator()

Without the decorator, the help is correct:

    Help on function foo in module __main__:
    
    foo()
        the magic foo function

 I know, that the function `foo` is wrapped by the decorator, and so the function object is not the function `foo` any more. But what is a nice solution to get the docstring (and the help) as expected?

Python decorator handling docstrings

I google the error message `getOutputStream() has already been called for this response`
and many people said it is because of the space or newline after `&lt;%` or `%&gt;`, but in my code , there is no a space or a newline. I am using tomcat6 on linux.

    &lt;%@
        page import=&quot;java.servlet.*,
        javax.servlet.http.*,
        java.io.*,
        java.util.*,
        com.lowagie.text.pdf.*,
        com.lowagie.text.*&quot;
        %&gt;&lt;%
        response.setContentType(&quot;application/pdf&quot;);
        Document document = new Document();
        try{
            ByteArrayOutputStream buffer = new ByteArrayOutputStream();
            PdfWriter.getInstance(document, buffer);
            document.open();
            PdfPTable table = new PdfPTable(2);
            table.addCell(&quot;1&quot;);
            table.addCell(&quot;2&quot;);
            table.addCell(&quot;3&quot;);
            table.addCell(&quot;4&quot;);
            table.addCell(&quot;5&quot;);
            table.addCell(&quot;6&quot;);
            document.add(table);
            document.close();
            DataOutput dataOutput = new DataOutputStream(response.getOutputStream());
            byte[] bytes = buffer.toByteArray();
            response.setContentLength(bytes.length);
            for(int i = 0; i &lt; bytes.length; i++)
            {
            dataOutput.writeByte(bytes[i]);
            }
        }catch(DocumentException e){
            e.printStackTrace();
        }

    %&gt;

~




    org.apache.jasper.JasperException: java.lang.IllegalStateException: getOutputStream() has already been called for this response
    	org.apache.jasper.servlet.JspServletWrapper.handleJspException(JspServletWrapper.java:522)
    	org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:410)
    	org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:342)
    	org.apache.jasper.servlet.JspServlet.service(JspServlet.java:267)
    	javax.servlet.http.HttpServlet.service(HttpServlet.java:717)

root cause 

    java.lang.IllegalStateException: getOutputStream() has already been called for this response
    	org.apache.catalina.connector.Response.getWriter(Response.java:610)
    	org.apache.catalina.connector.ResponseFacade.getWriter(ResponseFacade.java:198)
    	org.apache.jasper.runtime.JspWriterImpl.initOut(JspWriterImpl.java:125)
    	org.apache.jasper.runtime.JspWriterImpl.flushBuffer(JspWriterImpl.java:118)
    	org.apache.jasper.runtime.PageContextImpl.release(PageContextImpl.java:188)
    	org.apache.jasper.runtime.JspFactoryImpl.internalReleasePageContext(JspFactoryImpl.java:118)
    	org.apache.jasper.runtime.JspFactoryImpl.releasePageContext(JspFactoryImpl.java:77)
    	org.apache.jsp.Account.Domain.testPDF_jsp._jspService(testPDF_jsp.java:94)
    	org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:70)
    	javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
    	org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:374)
    	org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:342)
    	org.apache.jasper.servlet.JspServlet.service(JspServlet.java:267)
    	javax.servlet.http.HttpServlet.service(HttpServlet.java:717)





getOutputStream() has already been called for this response

I read some information about named branches and working with bookmarks. Unfortunately I still don&#39;t see a difference between them. Is there any?

Is there any difference between:

    hg branch blah
    hg up blah

and

    hg bookmark blah
    hg up blah

?

Why would I use a bookmark and how is it different from a named branch?

Mercurial branching and bookmarks

I read some information about named branches and working with bookmarks. Unfortunately I still don't see a difference between them. Is there any?
Is there any difference between:
<pre><code class="hljs">hg branch blah
hg up blah
</code></pre>
and
<pre><code class="hljs">hg bookmark blah
hg up blah
</code></pre>
?
Why would I use a bookmark and how is it different from a named branch?

I inherited a project originally stored in CVS with all the revisions. I made quite a few edits, and I&#39;m trying to compare all the changes I made in the original directory, in regards to new files added versus the old ones.

Is there some sort of utility for hg/git where I can do a tree diff, or something of that nature? So that say, there&#39;s a mark between newly added files, deleted files, am I asking for too much?

Diffing between two entire directories/projects in hg or git?

I&#39;ve been dabbling with hg / mercurial lately, namely in conjunction with Fogcreek&#39;s Kiln, and I&#39;m trying to figure out what the must-have extensions are.  Its a little tricky sifting through their extension list because I&#39;m not interested in testing any buggy or impractical extensions, even if their description sounds awesome.

So, which hg extensions do you use?  

See [Using Extensions](https://www.mercurial-scm.org/wiki/UsingExtensions)

What are the best and must-have hg / mercurial extensions?

I have a Mercurial repository for a personal project, and I have been storing the master repository in my Dropbox for a few weeks now (something along [this line][1]; and I understand it&#39;s also [possible with git][2]). 

The idea is that it serves both as a way to work with multiple machines and as a remote backup. *I clone the repository and work on the non-Dropbox copy, and only push updates once in a while, the same way I would, I suppose, work with Bitbucket.* 

Can you think of any drawbacks to this idea, compared to using dedicating hosting (BitBucket in the case of Mercurial)? *I know Bitbucket has free accounts for single users, which is great, but they are limited to 150M, which isn&#39;t a huge*. 

In particular, is it possible that Dropbox&#39;s sync process would corrupt the repository? I had to run *hg recover* once on the master repository, but it might be unrelated (and anyway it happily recovered). Does anyone have a bad experience with the idea? Does anyone have a longer good experience and can alleviate my worries? Does anyone have an opinion based on better understanding of the internals of these things?

edit: I added some clarifications to the questions. They are in *italics*. 

  [1]: http://iamthewalr.us/blog/2009/02/mercurial-and-dropbox/
  [2]: https://stackoverflow.com/questions/1960799/using-gitdropbox-together-effectively

Mercurial (and, I guess Git) with Dropbox: any drawbacks?

Is there a way to configure [TortoiseHg][1] to store my password?

I have a project hosted on [Google Code][2] that I access using TortoiseHg. Whenever I want to push changes to Google Code TortoiseHg prompts me for a username and password. Google Code requires me to use an auto-generated password, and it gets quite repetitive to look it up every time.


  [1]: http://tortoisehg.bitbucket.io/
  [2]: http://code.google.com/

Store password in TortoiseHg

I want to generate a list of which files changed between two revisions in a given directory in Mercurial.

In particular, I am not interested in *what* changed, but *which files* changed in that directory.

E.g., supposing that between `then` and `otherthen`, only 2 files changed:

    &gt;hg hypothetical-command -r then:otherthen
    foo.baz
    bar.baz
    &gt;

What&#39;s the hypothetical command? I&#39;ve tried diff and log, but I can&#39;t see how to convince them to do it: either I get the patch(diff), or I get the whole repo(log).


Generating a list of which files changed between hg versions

How do I compare one branch with another? I want to compare a branch with the latest revision in trunk.

SVN branch compare

I&#39;d like to push and pull all the branches by default, including the newly created ones.

Is there a setting that I can define for it?

Otherwise, when I add a new branch, locally and I want to pull it from the server, what is the simplest way to do it?

I created a new branch with the same name and tried to pull but it doesn&#39;t work. Asks me for all the remote config of the branch. How do I set it.

Set up git to pull and push all branches

I know that I can view the difference between HEAD and current state with &lt;code&gt;meld .&lt;/code&gt;. But how can I view the differences between branches, for example &lt;code&gt;master&lt;/code&gt; and &lt;code&gt;devel&lt;/code&gt; with meld?

At the moment I do the following steps:
&lt;ol&gt;
&lt;li&gt;Rename folder of working copy&lt;br/&gt;
    For example &lt;code&gt;mv /projectA /projectA_master&lt;/code&gt;)&lt;/li&gt;

&lt;li&gt;Clone the project again &lt;br/&gt;
    &lt;code&gt;git clone url&lt;/code&gt;&lt;/li&gt;

&lt;li&gt;Switch to &lt;code&gt;devel&lt;/code&gt; branch &lt;br/&gt;
    &lt;code&gt;cd projectA &amp;&amp; git -b devel origin/devel&lt;/code&gt; &lt;/li&gt;

&lt;li&gt;View differences with meld &lt;br/&gt;
    &lt;code&gt;meld /projectA_Master projectA&lt;/code&gt;&lt;/li&gt;
&lt;/ol&gt; 

Isn&#39;t there an easier way to get the same result in meld? I only need it to review the changes and not primarily for merging.



View differences of branches with meld?

I have a project with many branches.

I would like to work on **several** branches simultaneously without switching back and forth with `git checkout`.

Is there any way I can do that besides copying the whole repository somewhere else?

git working on two branches simultaneously

When working with a SCM system, when should you branch?



When should you branch?

iPhone web apps have four [configuration features][1] available (not including the HTML5 application cache) to configure how web pages behave when you save the web page to the home screen as a bookmark.

 1. You can specify the home page icon.
 2. You can specify a startup image that displays while the web page is loading.
 3. You can hide the browser UI.
 4. You can change the status bar color.

The four features work by adding tags to the &amp;lt;head&amp;gt; like this:

    &lt;link rel=&quot;apple-touch-icon&quot; href=&quot;/custom_icon.png&quot;/&gt;
    &lt;link rel=&quot;apple-touch-startup-image&quot; href=&quot;/startup.png&quot;&gt;
    &lt;meta name=&quot;apple-mobile-web-app-capable&quot; content=&quot;yes&quot; /&gt;
    &lt;meta name=&quot;apple-mobile-web-app-status-bar-style&quot; content=&quot;black&quot; /&gt;

Naturally, none of these &quot;apple-&quot; specific tags do anything in Android.  But is there any way to do something equivalent?  [At a minimum, I want users to be able to add my web page to their Android home screen (e.g. in Android 2.0) and have a pretty hi-res icon.]

  [1]: http://developer.apple.com/iphone/library/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html &quot;iPhone OS Reference Library: Configuring Web Applications&quot;

Configuring Android Web Applications

Is there any cross-browser bookmark/add to favorites using JavaScript. 

Searched for some list but none is working. Can you please suggest any?

Cross-browser bookmark/add to favorites JavaScript

What&#39;s the difference between a [tag][1] and a [bookmark][2] in Mercurial? I can&#39;t seem to find any discussion of how the two differ.


  [1]: https://www.mercurial-scm.org/wiki/Tag
  [2]: https://www.mercurial-scm.org/wiki/BookmarksExtension

what&#39;s the difference between hg tag and hg bookmark?

I couldn&#39;t find a way to put a bookmark inside the code in XCode 4. I know about the `#pragma mark` thing but it&#39;s not what I&#39;m looking for. What I need is something that I can put and remove with a mouse click and navigate amongst with next and previous, like in VS.

Is there anything that I&#39;m missing?

How to bookmark code in XCode 4?

I&#39;m building a website using Drupal. On the header of each page I want to have a single image (custom designed by me) which would act as a custom &quot;Add to Favorites&quot; button. Clicking on the image should add the website&#39;s URL to the user browser&#39;s favorites (bookmarks). This should work for all browsers, IE7+, FF, Opera, Chrome.
I wasn&#39;t able to find much information for this online. I suppose that javascript should do the job but I don&#39;t have much experience in Javascript :) so I need your help!

Content Type	Original Author	Original Content on Stackoverflow
Question	viraptor	View Question on Stackoverflow
Solution 1 - Mercurial	Ry4an Brase	View Answer on Stackoverflow

Mercurial branching and bookmarks

Mercurial Problem Overview

Mercurial Solutions

Solution 1 - Mercurial

getOutputStream() has already been called for this response

Python decorator handling docstrings

Attributions